projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add general-purpose timer to GUI
[emu8051.git]
/
src
/
gtk
/
emugtk.c
diff --git
a/src/gtk/emugtk.c
b/src/gtk/emugtk.c
index
d2fc533
..
72b7ea5
100644
(file)
--- a/
src/gtk/emugtk.c
+++ b/
src/gtk/emugtk.c
@@
-45,6
+45,7
@@
#include "pgmwin.h"
#include "memwin.h"
#include "pswwin.h"
#include "pgmwin.h"
#include "memwin.h"
#include "pswwin.h"
+#include "timerwin.h"
#include "app-config.h"
#define BUTTONS_BORDER 2
#include "app-config.h"
#define BUTTONS_BORDER 2
@@
-69,6
+70,7
@@
emugtk_UpdateDisplay(void)
regwin_refresh();
pgmwin_refresh();
pswwin_refresh();
regwin_refresh();
pgmwin_refresh();
pswwin_refresh();
+ timerwin_update();
if (cfg->view_int_memory && scrollwin_int)
memwin_refresh(INT_MEM_ID);
if (cfg->view_int_memory && scrollwin_int)
memwin_refresh(INT_MEM_ID);
@@
-507,6
+509,9
@@
emugtk_window_init(void)
scrollwin = pswwin_init();
gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100);
scrollwin = pswwin_init();
gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100);
+ scrollwin = timerwin_init();
+ gtk_box_pack_start(GTK_BOX(buttons_bar), scrollwin, FALSE, FALSE, 100);
+
/* hpaned will contain registers and disassembly windows. */
hpaned = gtk_hpaned_new();
gtk_paned_set_position(GTK_PANED(hpaned), cfg->hpane_pos);
/* hpaned will contain registers and disassembly windows. */
hpaned = gtk_hpaned_new();
gtk_paned_set_position(GTK_PANED(hpaned), cfg->hpane_pos);