X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=3a111cbcb4dc997686f4938530bf21e3ff017ded;hb=43cc485237ad6fab2ca1506ff3d3f4b1dfb904d5;hp=0ff59fb1b6feb785a2583fa063b6dcc08ce3f66a;hpb=5dc03cd1b8086d7f4dffa0c2b9cdea151d738450;p=emu8051.git

diff --git a/src/emugtk.c b/src/emugtk.c
index 0ff59fb..3a111cb 100644
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -22,6 +22,9 @@
 #include <stdio.h>
 #include "config.h"
 
+#include <stdint.h>
+#include <stdbool.h>
+
 #include <gtk/gtk.h>
 
 #include "common.h"
@@ -41,6 +44,8 @@
 #include "pgmwin.h"
 #include "memwin.h"
 
+#define BUTTONS_BORDER 2
+
 static int running;
 static int running_function_tag;
 static GtkWidget *mainwin;
@@ -102,21 +107,18 @@ emugtk_start_running(void)
 
 /* Taken from the Gxine source code. */
 static GtkWidget *
-AddPixButton(GtkWidget *box, gchar **pixmap_array)
+button_add_pix(GtkWidget *box, char **xpm)
 {
 	GtkWidget *button, *icon;
-	GdkPixmap *image;
-	GdkBitmap *transparent;
 
 	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_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, BUTTONS_BORDER);
 
 	return button;
 }
@@ -197,28 +199,28 @@ AddButtons(void)
 	button_hbox = gtk_hbox_new(FALSE, 0);
 
 	/* Creating the RESET button. */
-	button = AddPixButton(button_hbox, reset_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(emugtk_ResetEvent),
-			   NULL);
+	button = button_add_pix(button_hbox, reset_xpm);
+	g_signal_connect(button, "clicked",
+			 G_CALLBACK(emugtk_ResetEvent),
+			 NULL);
 
 	/* Creating the RUN button. */
-	button = AddPixButton(button_hbox, run_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(emugtk_RunEvent),
-			   NULL);
+	button = button_add_pix(button_hbox, run_xpm);
+	g_signal_connect(button, "clicked",
+			 G_CALLBACK(emugtk_RunEvent),
+			 NULL);
 
 	/* Creating STOP button. */
-	button = AddPixButton(button_hbox, stop_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(emugtk_StopEvent),
-			   NULL);
+	button = button_add_pix(button_hbox, stop_xpm);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			 G_CALLBACK(emugtk_StopEvent),
+			 NULL);
 
 	/* Creating STEP button. */
-	button = AddPixButton(button_hbox, step_xpm);
-	gtk_signal_connect(GTK_OBJECT(button), "clicked",
-			   GTK_SIGNAL_FUNC(emugtk_StepEvent),
-			   NULL);
+	button = button_add_pix(button_hbox, step_xpm);
+	g_signal_connect(GTK_OBJECT(button), "clicked",
+			 G_CALLBACK(emugtk_StepEvent),
+			 NULL);
 
 	return button_hbox;
 }
@@ -261,8 +263,8 @@ emugtk_window_init(void)
 	gtk_container_set_border_width(GTK_CONTAINER(mainwin), 0);
 
 	/* Window DESTROY event. */
-	gtk_signal_connect(GTK_OBJECT(mainwin), "destroy",
-			   GTK_SIGNAL_FUNC(WindowDestroyEvent), NULL);
+	g_signal_connect(mainwin, "destroy",
+			 G_CALLBACK(WindowDestroyEvent), NULL);
 
 	/*
 	 * Setting main window geometry based on command line options
@@ -330,7 +332,7 @@ AddMenuSeparator(GtkWidget *menu)
 	GtkWidget *item;
 
 	item = gtk_menu_item_new();
-	gtk_menu_append(GTK_MENU(menu), item);
+	gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 }
 
 void