diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2007-12-29 23:20:14 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2007-12-29 23:20:14 +0000 |
commit | cb1448416fce0d9b8dc2574e335619555bc9ebe5 (patch) | |
tree | 35bda7aeb3457e3f3f5e7e2ba1981369506eba2d /gtk/io_stat.c | |
parent | 1776029a7cb991af3104c3b3867df8bb747db0ef (diff) | |
download | wireshark-cb1448416fce0d9b8dc2574e335619555bc9ebe5.tar.gz wireshark-cb1448416fce0d9b8dc2574e335619555bc9ebe5.tar.bz2 wireshark-cb1448416fce0d9b8dc2574e335619555bc9ebe5.zip |
Fix a cut'n'paste error for GTK_VERSION < 2 in last commit.
Fixed some indentation.
svn path=/trunk/; revision=23975
Diffstat (limited to 'gtk/io_stat.c')
-rw-r--r-- | gtk/io_stat.c | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/gtk/io_stat.c b/gtk/io_stat.c index fd5eeab50c..1dba18d348 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1522,7 +1522,7 @@ create_ctrl_area(io_stat_t *io, GtkWidget *box) Windows and, I think, in Motif, "mnemonics"; Alt+<key> is a mnemonic, Ctrl+<key> is an accelerator). */ accel_group = gtk_accel_group_new(); - gtk_window_add_accel_group(GTK_WINDOW(find_frame_w), accel_group); + gtk_window_add_accel_group(GTK_WINDOW(io->window), accel_group); #endif frame_vbox=gtk_vbox_new(FALSE, 0); @@ -1911,13 +1911,13 @@ create_filter_area(io_stat_t *io, GtkWidget *box) GtkWidget *vbox; int i; - frame=gtk_frame_new("Graphs"); + frame=gtk_frame_new("Graphs"); gtk_container_add(GTK_CONTAINER(box), frame); gtk_widget_show(frame); vbox=gtk_vbox_new(FALSE, 1); gtk_container_add(GTK_CONTAINER(frame), vbox); - gtk_container_border_width(GTK_CONTAINER(vbox), 3); + gtk_container_border_width(GTK_CONTAINER(vbox), 3); gtk_box_set_child_packing(GTK_BOX(box), vbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(vbox); @@ -1951,7 +1951,7 @@ init_io_stat_window(io_stat_t *io) hbox=gtk_hbox_new(FALSE, 3); gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - gtk_container_border_width(GTK_CONTAINER(hbox), 3); + gtk_container_border_width(GTK_CONTAINER(hbox), 3); gtk_box_set_child_packing(GTK_BOX(vbox), hbox, FALSE, FALSE, 0, GTK_PACK_START); gtk_widget_show(hbox); @@ -1960,41 +1960,41 @@ init_io_stat_window(io_stat_t *io) io_stat_set_title(io); - if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) { + if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) { #if GTK_CHECK_VERSION(2,6,0) - bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, - GTK_STOCK_HELP, NULL); + bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, + GTK_STOCK_HELP, NULL); #else - bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL); + bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL); #endif - } else { + } else { #if GTK_CHECK_VERSION(2,6,0) - bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, NULL); + bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, NULL); #else - bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); + bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL); #endif - } + } gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0); - gtk_widget_show(bbox); + gtk_widget_show(bbox); - close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); - window_set_cancel_button(io->window, close_bt, window_cancel_button_cb); + close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); + window_set_cancel_button(io->window, close_bt, window_cancel_button_cb); #if GTK_CHECK_VERSION(2,6,0) - save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE); - gtk_widget_set_sensitive(save_bt, FALSE); - OBJECT_SET_DATA(io->window, "save_bt", save_bt); + save_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_SAVE); + gtk_widget_set_sensitive(save_bt, FALSE); + OBJECT_SET_DATA(io->window, "save_bt", save_bt); #endif - if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) { - help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP); - SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_IO_GRAPH_DIALOG); - } + if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) { + help_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_HELP); + SIGNAL_CONNECT(help_bt, "clicked", topic_cb, HELP_STATS_IO_GRAPH_DIALOG); + } - SIGNAL_CONNECT(io->window, "delete_event", window_delete_event_cb, NULL); + SIGNAL_CONNECT(io->window, "delete_event", window_delete_event_cb, NULL); - gtk_widget_show(io->window); - window_present(io->window); + gtk_widget_show(io->window); + window_present(io->window); } |