diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-01-21 21:19:34 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-01-21 21:19:34 +0000 |
| commit | 8e2a930023b7d8c86d8be142a01679a57c25e411 (patch) | |
| tree | b01c1b776bcd8de0d4a71cf67505cf3b289f3772 /gtk/main.c | |
| parent | d4b591b7dde96261093dca869e495adc5f6d39c9 (diff) | |
implemented dlg_button_row_new to get a standard function for
layouting the dialog buttons, and use it where appropriate.
This will help us with the GTK1/2 conflict on button layouts and
will also result in a more consistent look of the dialogs at all.
svn path=/trunk/; revision=9771
Diffstat (limited to 'gtk/main.c')
| -rw-r--r-- | gtk/main.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gtk/main.c b/gtk/main.c index 0fa174a7f3..7ae4c8df8f 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -1,6 +1,6 @@ /* main.c * - * $Id: main.c,v 1.365 2004/01/21 09:00:48 guy Exp $ + * $Id: main.c,v 1.366 2004/01/21 21:19:33 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -242,17 +242,13 @@ about_ethereal( GtkWidget *w _U_, gpointer data _U_ ) { gtk_widget_show(msg_label); /* Button row */ - bbox = gtk_hbutton_box_new(); - gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END); + bbox = dlg_button_row_new(GTK_STOCK_OK, NULL); gtk_container_add(GTK_CONTAINER(main_vb), bbox); gtk_widget_show(bbox); - ok_btn = BUTTON_NEW_FROM_STOCK(GTK_STOCK_OK); + ok_btn = OBJECT_GET_DATA(bbox, GTK_STOCK_OK); SIGNAL_CONNECT_OBJECT(ok_btn, "clicked", gtk_widget_destroy, win); - gtk_container_add(GTK_CONTAINER(bbox), ok_btn); - GTK_WIDGET_SET_FLAGS(ok_btn, GTK_CAN_DEFAULT); gtk_widget_grab_default(ok_btn); - gtk_widget_show(ok_btn); /* Catch the "key_press_event" signal in the window, so that we can catch the ESC key being pressed and act as if the "Cancel" button had @@ -3241,7 +3237,6 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs) /* Main Toolbar */ main_tb = toolbar_new(); - //gtk_box_pack_start(GTK_BOX(main_vbox), main_tb, FALSE, TRUE, 0); gtk_widget_show (main_tb); /* Packet list */ |