/* 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;
}
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_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
/* 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);
+ 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);
+ gtk_box_pack_start(GTK_BOX(hbox), fixed_frame, true, true, 1);
+
+ /* Adding hbox window to main_vbox */
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbox, 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 fixed window to main_vbox */
- gtk_box_pack_start(GTK_BOX(main_vbox), emufixed, FALSE, FALSE, 1);
+ /* 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);
GtkWidget *item;
item = gtk_menu_item_new();
- gtk_menu_append(GTK_MENU(menu), item);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
}
void