diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-02-25 23:35:13 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-02-25 23:35:13 +0000 |
commit | 162817ad33208c00ed5c99618eff77ff44d6f277 (patch) | |
tree | f2e9c71afa6413f4fa63d66448cf19f811d5e212 /ui/gtk/dlg_utils.c | |
parent | 0037adc30ef5c2566822f117df6158762afd10e6 (diff) |
it's ==> its & its ==> it's as needed.
In a few cases:
Fix spelling;
Clean up whitespace and formatting style.
svn path=/trunk/; revision=47889
Diffstat (limited to 'ui/gtk/dlg_utils.c')
-rw-r--r-- | ui/gtk/dlg_utils.c | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/ui/gtk/dlg_utils.c b/ui/gtk/dlg_utils.c index 4855f436df..86b34e009a 100644 --- a/ui/gtk/dlg_utils.c +++ b/ui/gtk/dlg_utils.c @@ -62,8 +62,8 @@ dlg_button_new(GtkWidget *hbox, GtkWidget *button_hbox, const gchar *stock_id) void dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) { GtkWidget *button_hbox, *button; - GList *children; - gint cur_item = 0; + GList *children; + gint cur_item = 0; if (!hbox) return; @@ -98,44 +98,44 @@ dlg_button_focus_nth(GtkWidget *hbox, gint focus_item) { GtkWidget * dlg_button_row_new(const gchar *stock_id_first, ...) { - gint buttons = 0; - va_list stock_id_list; + gint buttons = 0; + va_list stock_id_list; const gchar *stock_id = stock_id_first; GtkWidget *hbox; GtkWidget *button_hbox; GtkWidget *help_hbox; GtkWidget *button; - const gchar *apply = NULL; - const gchar *cancel = NULL; - const gchar *cap_start = NULL; - const gchar *cap_stop = NULL; - const gchar *cap_options = NULL; + const gchar *apply = NULL; + const gchar *cancel = NULL; + const gchar *cap_start = NULL; + const gchar *cap_stop = NULL; + const gchar *cap_options = NULL; #ifdef _WIN32 - const gchar *cap_details = NULL; + const gchar *cap_details = NULL; #endif - const gchar *clear = NULL; - const gchar *closex = NULL; - const gchar *copy = NULL; - const gchar *create_stat = NULL; - const gchar *delete = NULL; - const gchar *dont_save = NULL; - const gchar *filter_stream= NULL; - const gchar *find = NULL; - const gchar *help = NULL; - const gchar *jump = NULL; - const gchar *no = NULL; - const gchar *ok = NULL; - const gchar *print = NULL; - const gchar *save = NULL; - const gchar *save_as = NULL; - const gchar *save_all = NULL; - const gchar *stop = NULL; - const gchar *yes = NULL; - const gchar *refresh = NULL; - const gchar *add = NULL; + const gchar *clear = NULL; + const gchar *closex = NULL; + const gchar *copy = NULL; + const gchar *create_stat = NULL; + const gchar *delete = NULL; + const gchar *dont_save = NULL; + const gchar *filter_stream = NULL; + const gchar *find = NULL; + const gchar *help = NULL; + const gchar *jump = NULL; + const gchar *no = NULL; + const gchar *ok = NULL; + const gchar *print = NULL; + const gchar *save = NULL; + const gchar *save_as = NULL; + const gchar *save_all = NULL; + const gchar *stop = NULL; + const gchar *yes = NULL; + const gchar *refresh = NULL; + const gchar *add = NULL; #ifdef HAVE_GEOIP - const gchar *map = NULL; + const gchar *map = NULL; #endif /* HAVE_GEOIP */ const gchar *follow_stream = NULL; const gchar *graph_a_b = NULL; @@ -389,10 +389,10 @@ dlg_button_row_new(const gchar *stock_id_first, ...) return hbox; } if (save && dont_save && cancel) { - dlg_button_new(hbox, button_hbox, dont_save); - dlg_button_new(hbox, button_hbox, cancel); - dlg_button_new(hbox, button_hbox, save); - return hbox; + dlg_button_new(hbox, button_hbox, dont_save); + dlg_button_new(hbox, button_hbox, cancel); + dlg_button_new(hbox, button_hbox, save); + return hbox; } } if (buttons == 4) { @@ -414,33 +414,33 @@ dlg_button_row_new(const gchar *stock_id_first, ...) #endif /* beware: sequence of buttons is important! */ - if (ok != NULL) dlg_button_new(hbox, button_hbox, ok); - if (delete != NULL) dlg_button_new(hbox, button_hbox, delete); - if (jump != NULL) dlg_button_new(hbox, button_hbox, jump); - if (find != NULL) dlg_button_new(hbox, button_hbox, find); - if (print != NULL) dlg_button_new(hbox, button_hbox, print); - if (create_stat != NULL) dlg_button_new(hbox, button_hbox, create_stat); - if (apply != NULL) dlg_button_new(hbox, button_hbox, apply); - if (yes != NULL) dlg_button_new(hbox, button_hbox, yes); - if (no != NULL) dlg_button_new(hbox, button_hbox, no); - if (save != NULL) dlg_button_new(hbox, button_hbox, save); - if (save_as != NULL) dlg_button_new(hbox, button_hbox, save_as); - if (save_all != NULL) dlg_button_new(hbox, button_hbox, save_all); - if (dont_save != NULL) dlg_button_new(hbox, button_hbox, dont_save); - if (cap_start != NULL) dlg_button_new(hbox, button_hbox, cap_start); - if (cap_stop != NULL) dlg_button_new(hbox, button_hbox, cap_stop); - if (cap_options != NULL) dlg_button_new(hbox, button_hbox, cap_options); + if (ok != NULL) dlg_button_new(hbox, button_hbox, ok); + if (delete != NULL) dlg_button_new(hbox, button_hbox, delete); + if (jump != NULL) dlg_button_new(hbox, button_hbox, jump); + if (find != NULL) dlg_button_new(hbox, button_hbox, find); + if (print != NULL) dlg_button_new(hbox, button_hbox, print); + if (create_stat != NULL) dlg_button_new(hbox, button_hbox, create_stat); + if (apply != NULL) dlg_button_new(hbox, button_hbox, apply); + if (yes != NULL) dlg_button_new(hbox, button_hbox, yes); + if (no != NULL) dlg_button_new(hbox, button_hbox, no); + if (save != NULL) dlg_button_new(hbox, button_hbox, save); + if (save_as != NULL) dlg_button_new(hbox, button_hbox, save_as); + if (save_all != NULL) dlg_button_new(hbox, button_hbox, save_all); + if (dont_save != NULL) dlg_button_new(hbox, button_hbox, dont_save); + if (cap_start != NULL) dlg_button_new(hbox, button_hbox, cap_start); + if (cap_stop != NULL) dlg_button_new(hbox, button_hbox, cap_stop); + if (cap_options != NULL) dlg_button_new(hbox, button_hbox, cap_options); #ifdef _WIN32 - if (cap_details != NULL) dlg_button_new(hbox, button_hbox, cap_details); + if (cap_details != NULL) dlg_button_new(hbox, button_hbox, cap_details); #endif - if (stop != NULL) dlg_button_new(hbox, button_hbox, stop); - if (clear != NULL) dlg_button_new(hbox, button_hbox, clear); - if (filter_stream!= NULL) dlg_button_new(hbox, button_hbox, filter_stream); + if (stop != NULL) dlg_button_new(hbox, button_hbox, stop); + if (clear != NULL) dlg_button_new(hbox, button_hbox, clear); + if (filter_stream != NULL) dlg_button_new(hbox, button_hbox, filter_stream); if (follow_stream != NULL) dlg_button_new(hbox, button_hbox, follow_stream); - if (graph_a_b != NULL) dlg_button_new(hbox, button_hbox, graph_a_b); - if (graph_b_a != NULL) dlg_button_new(hbox, button_hbox, graph_b_a); - if (closex != NULL) dlg_button_new(hbox, button_hbox, closex); - if (cancel != NULL) dlg_button_new(hbox, button_hbox, cancel); + if (graph_a_b != NULL) dlg_button_new(hbox, button_hbox, graph_a_b); + if (graph_b_a != NULL) dlg_button_new(hbox, button_hbox, graph_b_a); + if (closex != NULL) dlg_button_new(hbox, button_hbox, closex); + if (cancel != NULL) dlg_button_new(hbox, button_hbox, cancel); return hbox; } @@ -483,7 +483,7 @@ dlg_window_new(const gchar *title) } /* Create a configuration dialog box window that belongs to Wireshark's - * main window and add the name of the current profile name to it's title bar + * main window and add the name of the current profile name to its title bar */ GtkWidget * dlg_conf_window_new(const gchar *title) @@ -506,15 +506,15 @@ dlg_conf_window_new(const gchar *title) return win; } -/* Set the "activate" signal for a widget to call a routine to - activate the "OK" button for a dialog box. +/* Set the "activate" signal for a widget to call a routine to + activate the "OK" button for a dialog box. - XXX - there should be a way to specify that a GtkEntry widget - shouldn't itself handle the Return key, but should let it be - passed on to the parent, so that you don't have to do this - by hand for every GtkEntry widget in a dialog box, but, alas, - there isn't. (Does this problem exist for other widgets? - I.e., are there any others that seize the Return key? */ + XXX - there should be a way to specify that a GtkEntry widget + shouldn't itself handle the Return key, but should let it be + passed on to the parent, so that you don't have to do this + by hand for every GtkEntry widget in a dialog box, but, alas, + there isn't. (Does this problem exist for other widgets? + I.e., are there any others that seize the Return key? */ void dlg_set_activate(GtkWidget *widget, GtkWidget *ok_button) { |