X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Femugtk.c;h=7cd5a2a3995afb228049ba8d67252e89b77971a2;hb=6c53f8ff0267ae104d1b60efb3b8285df338e473;hp=774278880a5f4d37eea5033231a5af9375b01545;hpb=ba7ff1a7a78b3aa7c2cad9bfce117256638938b1;p=emu8051.git

diff --git a/src/emugtk.c b/src/emugtk.c
index 7742788..7cd5a2a 100644
--- a/src/emugtk.c
+++ b/src/emugtk.c
@@ -49,20 +49,10 @@
 
 static int running;
 static int running_function_tag;
-static GtkWidget *mainwin;
 
-extern struct app_config_t *cfg;
+GtkWidget *mainwin;
 
-/* Signal DestroyEvent */
-static void
-WindowDestroyEvent(GtkWidget *widget, gpointer data)
-{
-#ifdef EMU8051_DEBUG
-	g_print("emugtk_DestroyEvent(...)\n");
-#endif
-
-	gtk_main_quit();
-}
+extern struct app_config_t *cfg;
 
 /* Step out of running state */
 static void
@@ -245,16 +235,12 @@ AddMenu(void)
 	/* Adding the 'Help' submenu */
 	HelpAddMenu(menu_bar);
 
-	gtk_widget_show_all(GTK_WIDGET(menu_bar));
-
 	return menu_bar;
 }
 
 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;
 
@@ -349,7 +335,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);