X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=de62d4b843212da5243813b60afa5023cd42460d;hb=4760af53eefe4800ec1d0c18b6dd00ef68efe796;hp=7749763e8d85d4f8e5320839061a219f5cc006ae;hpb=4d60f6b8f78f5a9e7307b5e8ee0468247f02ec64;p=emu8051.git

diff --git a/src/emugtk.c b/src/emugtk.c
index 7749763..de62d4b 100644
--- 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;
 }
@@ -253,24 +253,17 @@ emugtk_window_init(void)
 	GtkWidget *main_vbox;
 	GtkWidget *menu_bar;
 	GtkWidget *buttons_bar;
-	GtkWidget *emufixed;
 	GtkWidget *fixed_frame;
+	GtkWidget *hpaned;
+	GtkWidget *vpaned;
 
 	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_container_set_border_width(GTK_CONTAINER(mainwin), 0);
 
 	/* Window DESTROY event. */
-	gtk_signal_connect(GTK_OBJECT(mainwin), "destroy",
-			   GTK_SIGNAL_FUNC(WindowDestroyEvent), NULL);
-
-	/*
-	 * Setting main window geometry based on command line options
-	 * (if specified).
-	*/
-	/*MainWindowSetGeometry();*/
+	g_signal_connect(mainwin, "destroy",
+			 G_CALLBACK(WindowDestroyEvent), NULL);
 
 	/*
 	 * main_vbox contains the menu bar and body_vbox (for all remaining
@@ -288,25 +281,32 @@ emugtk_window_init(void)
 	/* Adding buttons bar to main_vbox */
 	gtk_box_pack_start(GTK_BOX(main_vbox), buttons_bar, FALSE, FALSE, 1);
 
-	/* Emulator fixed window. */
-	emufixed = gtk_fixed_new();
-	gtk_widget_set_usize(GTK_WIDGET(emufixed), MAIN_WIN_WIDTH,
-			     REG_WIN_HEIGHT + MEM_WIN_HEIGHT + 10);
+	/*
+	 * vpaned will contain:
+	 *   Top:    registers and disassembly windows.
+	 *   Bottom: memory window
+	 */
+	vpaned = gtk_vpaned_new();
+
+	/* hpaned will contain registers and disassembly windows. */
+	hpaned = gtk_hpaned_new();
 
 	/* 8051 registers frame. */
-	fixed_frame = regwin_init(REG_WIN_WIDTH, REG_WIN_HEIGHT);
-	gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, 0);
+	fixed_frame = regwin_init();
+	gtk_paned_pack1(GTK_PANED(hpaned), fixed_frame, FALSE, FALSE);
 
 	/* Program disassembly frame. */
-	fixed_frame = pgmwin_init(PGM_WIN_WIDTH, PGM_WIN_HEIGHT);
-	gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, REG_WIN_WIDTH + 10, 0);
+	fixed_frame = pgmwin_init();
+	gtk_paned_pack2(GTK_PANED(hpaned), fixed_frame, TRUE, FALSE);
+
+	gtk_paned_pack1(GTK_PANED(vpaned), hpaned, FALSE, FALSE);
 
 	/* Memory dump frame. */
-	fixed_frame = memwin_init(MEM_WIN_WIDTH, MEM_WIN_HEIGHT);
-	gtk_fixed_put(GTK_FIXED(emufixed), fixed_frame, 0, REG_WIN_HEIGHT);
+	fixed_frame = memwin_init();
+	gtk_paned_pack2(GTK_PANED(vpaned), fixed_frame, TRUE, FALSE);
 
-	/* Adding fixed window to main_vbox */
-	gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1);
+	/* Adding vpaned window to main_vbox */
+	gtk_box_pack_start(GTK_BOX(main_vbox), vpaned, true, true, 1);
 
 	/* Adding the main_vbox to the main window. */
 	gtk_container_add(GTK_CONTAINER(mainwin), main_vbox);
@@ -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