diff --git a/src/pw3270/uiparser/keypad.c b/src/pw3270/uiparser/keypad.c index bcf7037..e3f470b 100644 --- a/src/pw3270/uiparser/keypad.c +++ b/src/pw3270/uiparser/keypad.c @@ -32,12 +32,12 @@ /*--[ Globals ]--------------------------------------------------------------------------------------*/ - struct row + struct row { unsigned short pos; unsigned short num_cols; GList * cols; - }; + }; struct keypad { @@ -123,7 +123,7 @@ { gchar *text = g_strconcat("gtk-",icon,NULL); widget = gtk_button_new(); - gtk_container_add(GTK_CONTAINER(widget),gtk_image_new_from_stock(text,GTK_ICON_SIZE_SMALL_TOOLBAR)); + gtk_container_add(GTK_CONTAINER(widget),gtk_image_new_from_stock(text,GTK_ICON_SIZE_SMALL_TOOLBAR)); g_free(text); } @@ -137,7 +137,7 @@ gtk_widget_set_can_default(widget,FALSE); #else GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_DEFAULT); + GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_DEFAULT); #endif // GTK(2,18) if(!name) @@ -148,8 +148,8 @@ } gtk_button_set_relief(GTK_BUTTON(widget),get_relief(names, values, keypad->relief)); - gtk_button_set_alignment(GTK_BUTTON(widget),0.5,0.5); - gtk_button_set_focus_on_click(GTK_BUTTON(widget),FALSE); + gtk_button_set_alignment(GTK_BUTTON(widget),0.5,0.5); + gtk_button_set_focus_on_click(GTK_BUTTON(widget),FALSE); action = ui_get_action(info->center_widget,name,info->actions,names,values,error); @@ -269,23 +269,23 @@ { case UI_ATTR_UP: keypad->box = gtk_vbox_new(FALSE,0); - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_BOTTOM); + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_BOTTOM); break; case UI_ATTR_DOWN: - keypad->box = gtk_vbox_new(FALSE,0); - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_TOP); + keypad->box = gtk_vbox_new(FALSE,0); + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_TOP); break; case UI_ATTR_LEFT: - keypad->box = gtk_hbox_new(FALSE,0); - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_RIGHT); + keypad->box = gtk_hbox_new(FALSE,0); + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_RIGHT); break; default: keypad->pos = UI_ATTR_RIGHT; - keypad->box = gtk_hbox_new(FALSE,0); - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_LEFT); + keypad->box = gtk_hbox_new(FALSE,0); + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_LEFT); } @@ -302,8 +302,8 @@ } } - gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(keypad->handle),GTK_SHADOW_ETCHED_IN); - gtk_container_add(GTK_CONTAINER(keypad->handle),keypad->box); + gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(keypad->handle),GTK_SHADOW_ETCHED_IN); + gtk_container_add(GTK_CONTAINER(keypad->handle),keypad->box); g_markup_parse_context_push(context,(GMarkupParser *) &parser,keypad); @@ -318,7 +318,7 @@ widget, keypad->col,keypad->col+keypad->button_width, keypad->num_rows,keypad->num_rows+1, - GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0 ); + GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0 ); } keypad->col += keypad->button_width; @@ -357,13 +357,18 @@ gtk_widget_set_can_default(keypad->table,FALSE); #else GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_FOCUS); - GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_DEFAULT); + GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_DEFAULT); #endif // GTK(2,18) keypad->num_rows = 0; g_list_foreach(keypad->rows,(GFunc) create_row,keypad); +#if GTK_CHECK_VERSION(2,28,0) g_list_free_full(keypad->rows,g_free); - gtk_box_pack_start(GTK_BOX(keypad->box),keypad->table,FALSE,FALSE,0); +#else + g_list_foreach(keypad->rows,(GFunc) g_free,NULL); + g_list_free(keypad->rows); +#endif // GTK(2,28) + gtk_box_pack_start(GTK_BOX(keypad->box),keypad->table,FALSE,FALSE,0); gtk_widget_show_all(keypad->box); } -- libgit2 0.21.2