Replace deprecated gtk_clist (pgmwin)

[emu8051.git] / src / emugtk.c

diff --git a/src/emugtk.c b/src/emugtk.c
index 224bc93..328fd42 100644 (file)
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -53,17 +53,6 @@ static GtkWidget *mainwin;
 
 extern struct app_config_t *cfg;
 
-/* Signal DestroyEvent */
-static void
-WindowDestroyEvent(GtkWidget *widget, gpointer data)
-{
-#ifdef EMU8051_DEBUG
-       g_print("emugtk_DestroyEvent(...)\n");
-#endif
-
-       gtk_main_quit();
-}
-
 /* Step out of running state */
 static void
 emugtk_stop_running()
@@ -245,18 +234,21 @@ AddMenu(void)
        /* Adding the 'Help' submenu */
        HelpAddMenu(menu_bar);
 
-       gtk_widget_show_all(GTK_WIDGET(menu_bar));
-
        return menu_bar;
 }
 
-static void
+static int
 mainwin_configure_event(GtkWindow *window, GdkEvent *event, gpointer data)
 {
-       //event->configure.x;
-       //event->configure.y;
        cfg->win_width = event->configure.width;
        cfg->win_height = event->configure.height;
+
+       /*
+        * Important:
+        * Returning false allows event to propagate to children. If not, they
+        * will not be resized when we resize the main window.
+        */
+       return FALSE;
 }
 
 static void
@@ -342,7 +334,7 @@ emugtk_window_init(void)
 
        /* Window DESTROY event. */
        g_signal_connect(mainwin, "destroy",
-                        G_CALLBACK(WindowDestroyEvent), NULL);
+                        G_CALLBACK(gtk_main_quit), NULL);
 
        g_signal_connect(G_OBJECT(mainwin), "configure-event",
                         G_CALLBACK(mainwin_configure_event), NULL);