Replace fixed frames with scrollable windows

[emu8051.git] / src / emugtk.c

diff --git a/src/emugtk.c b/src/emugtk.c
index 7749763..b9e7469 100644 (file)
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -200,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;
 }
@@ -258,13 +258,13 @@ emugtk_window_init(void)
 
        mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_window_set_title(GTK_WINDOW(mainwin), PACKAGE);
-       gtk_widget_set_usize(GTK_WIDGET(mainwin),
-                            MAIN_WIN_WIDTH, MAIN_WIN_HEIGHT);
+       gtk_window_set_default_size(GTK_WINDOW(mainwin),
+                                   MAIN_WIN_WIDTH, MAIN_WIN_HEIGHT);
        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
@@ -290,8 +290,8 @@ emugtk_window_init(void)
 
        /* Emulator fixed window. */
        emufixed = gtk_fixed_new();
-       gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH,
-                            REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10);
+       gtk_window_set_default_size(GTK_WINDOW(emufixed), MAIN_WIN_WIDTH,
+                                   REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10);
 
        /* 8051 registers frame. */
        fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT);
@@ -332,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