diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-29 19:09:01 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-29 19:09:01 +0000 |
| commit | 538dd47d5dd49ab0e503c2b400b2a76e68f8893e (patch) | |
| tree | 25046d3a1f535bc9ac27ed8e266972e9a4f7c9cc /gtk/uat_gui.c | |
| parent | 7b01915b6ba0a8a6d0b8383e6a6a83d62fe40909 (diff) | |
Fix various gcc -Wshadow warnings.
svn path=/trunk/; revision=31731
Diffstat (limited to 'gtk/uat_gui.c')
| -rw-r--r-- | gtk/uat_gui.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index f917206462..15891ecf6b 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -472,15 +472,15 @@ static void uat_edit_dialog(uat_t* uat, gint row) { } case PT_TXTMOD_ENUM: { GtkWidget *menu, *option_menu; - int menu_index, index; + int menu_idx, idx; const value_string* enum_vals = f[colnum].fld_data; void* valptr = g_malloc0(sizeof(void*)); menu = gtk_menu_new(); - menu_index = -1; - for (index = 0; enum_vals[index].strptr != NULL; index++) { + menu_idx = -1; + for (idx = 0; enum_vals[idx].strptr != NULL; idx++) { struct _fld_menu_item_data_t* md = g_malloc(sizeof(struct _fld_menu_item_data_t)); - const char* str = enum_vals[index].strptr; + const char* str = enum_vals[idx].strptr; GtkWidget* menu_item = gtk_menu_item_new_with_label(str); md->text = str; @@ -489,7 +489,7 @@ static void uat_edit_dialog(uat_t* uat, gint row) { gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item); if ( g_str_equal(str, text) ) { - menu_index = index; + menu_idx = idx; *((char const**)valptr) = str; } @@ -505,8 +505,8 @@ static void uat_edit_dialog(uat_t* uat, gint row) { gtk_option_menu_set_menu(GTK_OPTION_MENU(option_menu), menu); /* Set its current value to the variable's current value */ - if (menu_index != -1) - gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), menu_index); + if (menu_idx != -1) + gtk_option_menu_set_history(GTK_OPTION_MENU(option_menu), menu_idx); gtk_table_attach_defaults(GTK_TABLE(main_tb), option_menu, 1, 2, colnum+1, colnum + 2); |