projects
/
emu8051.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Increase spacing between buttons
[emu8051.git]
/
src
/
emugtk.c
diff --git
a/src/emugtk.c
b/src/emugtk.c
index
3d6ff1f
..
7749763
100644
(file)
--- a/
src/emugtk.c
+++ b/
src/emugtk.c
@@
-22,6
+22,9
@@
#include <stdio.h>
#include "config.h"
#include <stdio.h>
#include "config.h"
+#include <stdint.h>
+#include <stdbool.h>
+
#include <gtk/gtk.h>
#include "common.h"
#include <gtk/gtk.h>
#include "common.h"
@@
-41,6
+44,8
@@
#include "pgmwin.h"
#include "memwin.h"
#include "pgmwin.h"
#include "memwin.h"
+#define BUTTONS_BORDER 2
+
static int running;
static int running_function_tag;
static GtkWidget *mainwin;
static int running;
static int running_function_tag;
static GtkWidget *mainwin;
@@
-64,7
+69,7
@@
emugtk_stop_running()
#ifdef EMU8051_DEBUG
printf("emugtk_StopRunning()\n");
#endif
#ifdef EMU8051_DEBUG
printf("emugtk_StopRunning()\n");
#endif
- g
tk_idl
e_remove(running_function_tag);
+ g
_sourc
e_remove(running_function_tag);
running = 0;
regwin_Show();
pgmwin_Disasm();
running = 0;
regwin_Show();
pgmwin_Disasm();
@@
-95,28
+100,25
@@
emugtk_start_running(void)
#ifdef EMU8051_DEBUG
printf("emugtk_StartRunning()\n");
#endif
#ifdef EMU8051_DEBUG
printf("emugtk_StartRunning()\n");
#endif
- running_function_tag = g
tk
_idle_add(emugtk_running, 0);
+ running_function_tag = g_idle_add(emugtk_running, 0);
running = 1;
}
}
/* Taken from the Gxine source code. */
static GtkWidget *
running = 1;
}
}
/* Taken from the Gxine source code. */
static GtkWidget *
-
AddPixButton(GtkWidget *box, gchar **pixmap_array
)
+
button_add_pix(GtkWidget *box, char **xpm
)
{
GtkWidget *button, *icon;
{
GtkWidget *button, *icon;
- GdkPixmap *image;
- GdkBitmap *transparent;
button = gtk_button_new();
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL);
button = gtk_button_new();
gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NORMAL);
- image = gdk_pixmap_colormap_create_from_xpm_d(
- NULL, gdk_colormap_get_system(),
- &transparent, NULL, pixmap_array);
- icon = gtk_pixmap_new(image, transparent);
+
+ icon = gtk_image_new_from_pixbuf(
+ gdk_pixbuf_new_from_xpm_data((const char **) xpm));
gtk_container_add(GTK_CONTAINER(button), icon);
gtk_container_add(GTK_CONTAINER(button), icon);
- gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE,
0
);
+ gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE,
BUTTONS_BORDER
);
return button;
}
return button;
}
@@
-197,25
+199,25
@@
AddButtons(void)
button_hbox = gtk_hbox_new(FALSE, 0);
/* Creating the RESET button. */
button_hbox = gtk_hbox_new(FALSE, 0);
/* Creating the RESET button. */
- button =
AddPixButton
(button_hbox, reset_xpm);
+ button =
button_add_pix
(button_hbox, reset_xpm);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_ResetEvent),
NULL);
/* Creating the RUN button. */
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_ResetEvent),
NULL);
/* Creating the RUN button. */
- button =
AddPixButton
(button_hbox, run_xpm);
+ button =
button_add_pix
(button_hbox, run_xpm);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_RunEvent),
NULL);
/* Creating STOP button. */
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_RunEvent),
NULL);
/* Creating STOP button. */
- button =
AddPixButton
(button_hbox, stop_xpm);
+ button =
button_add_pix
(button_hbox, stop_xpm);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_StopEvent),
NULL);
/* Creating STEP button. */
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_StopEvent),
NULL);
/* Creating STEP button. */
- button =
AddPixButton
(button_hbox, step_xpm);
+ button =
button_add_pix
(button_hbox, step_xpm);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_StepEvent),
NULL);
gtk_signal_connect(GTK_OBJECT(button), "clicked",
GTK_SIGNAL_FUNC(emugtk_StepEvent),
NULL);