X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=src%2Femugtk.c;h=7d05a697dd1f5f7297069ad595b794e747f6d3bb;hb=bd7fa9a1fba21965467664b72772dddc5e9e0884;hp=982a236180a4e7c7381c74527fa9beaa520369da;hpb=cece320b97e8438693b2b5bbc82380d40e1c7d94;p=emu8051.git diff --git a/src/emugtk.c b/src/emugtk.c index 982a236..7d05a69 100644 --- a/src/emugtk.c +++ b/src/emugtk.c @@ -253,25 +253,17 @@ emugtk_window_init(void) GtkWidget *main_vbox; GtkWidget *menu_bar; GtkWidget *buttons_bar; - GtkWidget *emufixed; GtkWidget *fixed_frame; + GtkWidget *hbox; 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. */ g_signal_connect(mainwin, "destroy", G_CALLBACK(WindowDestroyEvent), NULL); - /* - * Setting main window geometry based on command line options - * (if specified). - */ - /*MainWindowSetGeometry();*/ - /* * main_vbox contains the menu bar and body_vbox (for all remaining * items). @@ -288,25 +280,24 @@ 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); + /* hbox will contain registers and disassembly windows. */ + hbox = gtk_hbox_new(FALSE, 1); /* 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_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); /* 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_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1); - /* 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); + /* Adding hbox window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), hbox, true, true, 1); - /* Adding fixed window to main_vbox */ - gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1); + /* Memory dump frame. */ + fixed_frame = memwin_init(); + /* Adding memory dump window to main_vbox */ + gtk_box_pack_start(GTK_BOX(main_vbox), fixed_frame, true, true, 1); /* Adding the main_vbox to the main window. */ gtk_container_add(GTK_CONTAINER(mainwin), main_vbox); @@ -332,7 +323,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