Replace deprecated gtk_menu_append()

[emu8051.git] / src / emugtk.c

diff --git a/src/emugtk.c b/src/emugtk.c
index bf22a9e..3a111cb 100644 (file)
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -44,6 +44,8 @@
 #include "pgmwin.h"
 #include "memwin.h"
 
+#define BUTTONS_BORDER 2
+
 static int running;
 static int running_function_tag;
 static GtkWidget *mainwin;
@@ -116,7 +118,7 @@ button_add_pix(GtkWidget *box, char **xpm)
                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;
 }
@@ -198,27 +200,27 @@ AddButtons(void)
 
        /* Creating the RESET button. */
        button = button_add_pix(button_hbox, reset_xpm);
-       gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                          GTK_SIGNAL_FUNC(emugtk_ResetEvent),
-                          NULL);
+       g_signal_connect(button, "clicked",
+                        G_CALLBACK(emugtk_ResetEvent),
+                        NULL);
 
        /* Creating the RUN button. */
        button = button_add_pix(button_hbox, run_xpm);
-       gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                          GTK_SIGNAL_FUNC(emugtk_RunEvent),
-                          NULL);
+       g_signal_connect(button, "clicked",
+                        G_CALLBACK(emugtk_RunEvent),
+                        NULL);
 
        /* Creating STOP button. */
        button = button_add_pix(button_hbox, stop_xpm);
-       gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                          GTK_SIGNAL_FUNC(emugtk_StopEvent),
-                          NULL);
+       g_signal_connect(GTK_OBJECT(button), "clicked",
+                        G_CALLBACK(emugtk_StopEvent),
+                        NULL);
 
        /* Creating STEP button. */
        button = button_add_pix(button_hbox, step_xpm);
-       gtk_signal_connect(GTK_OBJECT(button), "clicked",
-                          GTK_SIGNAL_FUNC(emugtk_StepEvent),
-                          NULL);
+       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