Download as
Browse Code »

Commit a790905fc3ca436484aea9b163c53ede3777991a

Authored by perry.werneck@gmail.com
1 parent 42bf282b
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para funcionar no Ubuntu 10.10

Showing 1 changed file with 23 additions and 18 deletions   Show diff stats
src/pw3270/uiparser/keypad.c
  Diff comments   View file @a790905
... ... @@ -32,12 +32,12 @@
32 32  
33 33 /*--[ Globals ]--------------------------------------------------------------------------------------*/
34 34  
35   - struct row
  35 + struct row
36 36 {
37 37 unsigned short pos;
38 38 unsigned short num_cols;
39 39 GList * cols;
40   - };
  40 + };
41 41  
42 42 struct keypad
43 43 {
... ... @@ -123,7 +123,7 @@
123 123 {
124 124 gchar *text = g_strconcat("gtk-",icon,NULL);
125 125 widget = gtk_button_new();
126   - gtk_container_add(GTK_CONTAINER(widget),gtk_image_new_from_stock(text,GTK_ICON_SIZE_SMALL_TOOLBAR));
  126 + gtk_container_add(GTK_CONTAINER(widget),gtk_image_new_from_stock(text,GTK_ICON_SIZE_SMALL_TOOLBAR));
127 127 g_free(text);
128 128 }
129 129  
... ... @@ -137,7 +137,7 @@
137 137 gtk_widget_set_can_default(widget,FALSE);
138 138 #else
139 139 GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_FOCUS);
140   - GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_DEFAULT);
  140 + GTK_WIDGET_UNSET_FLAGS(widget,GTK_CAN_DEFAULT);
141 141 #endif // GTK(2,18)
142 142  
143 143 if(!name)
... ... @@ -148,8 +148,8 @@
148 148 }
149 149  
150 150 gtk_button_set_relief(GTK_BUTTON(widget),get_relief(names, values, keypad->relief));
151   - gtk_button_set_alignment(GTK_BUTTON(widget),0.5,0.5);
152   - gtk_button_set_focus_on_click(GTK_BUTTON(widget),FALSE);
  151 + gtk_button_set_alignment(GTK_BUTTON(widget),0.5,0.5);
  152 + gtk_button_set_focus_on_click(GTK_BUTTON(widget),FALSE);
153 153  
154 154 action = ui_get_action(info->center_widget,name,info->actions,names,values,error);
155 155  
... ... @@ -269,23 +269,23 @@
269 269 {
270 270 case UI_ATTR_UP:
271 271 keypad->box = gtk_vbox_new(FALSE,0);
272   - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_BOTTOM);
  272 + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_BOTTOM);
273 273 break;
274 274  
275 275 case UI_ATTR_DOWN:
276   - keypad->box = gtk_vbox_new(FALSE,0);
277   - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_TOP);
  276 + keypad->box = gtk_vbox_new(FALSE,0);
  277 + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_TOP);
278 278 break;
279 279  
280 280 case UI_ATTR_LEFT:
281   - keypad->box = gtk_hbox_new(FALSE,0);
282   - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_RIGHT);
  281 + keypad->box = gtk_hbox_new(FALSE,0);
  282 + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_RIGHT);
283 283 break;
284 284  
285 285 default:
286 286 keypad->pos = UI_ATTR_RIGHT;
287   - keypad->box = gtk_hbox_new(FALSE,0);
288   - gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_LEFT);
  287 + keypad->box = gtk_hbox_new(FALSE,0);
  288 + gtk_handle_box_set_handle_position(GTK_HANDLE_BOX(keypad->handle),GTK_POS_LEFT);
289 289  
290 290 }
291 291  
... ... @@ -302,8 +302,8 @@
302 302 }
303 303 }
304 304  
305   - gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(keypad->handle),GTK_SHADOW_ETCHED_IN);
306   - gtk_container_add(GTK_CONTAINER(keypad->handle),keypad->box);
  305 + gtk_handle_box_set_shadow_type(GTK_HANDLE_BOX(keypad->handle),GTK_SHADOW_ETCHED_IN);
  306 + gtk_container_add(GTK_CONTAINER(keypad->handle),keypad->box);
307 307  
308 308 g_markup_parse_context_push(context,(GMarkupParser *) &parser,keypad);
309 309  
... ... @@ -318,7 +318,7 @@
318 318 widget,
319 319 keypad->col,keypad->col+keypad->button_width,
320 320 keypad->num_rows,keypad->num_rows+1,
321   - GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0 );
  321 + GTK_EXPAND|GTK_FILL,GTK_EXPAND|GTK_FILL,0,0 );
322 322  
323 323 }
324 324 keypad->col += keypad->button_width;
... ... @@ -357,13 +357,18 @@
357 357 gtk_widget_set_can_default(keypad->table,FALSE);
358 358 #else
359 359 GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_FOCUS);
360   - GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_DEFAULT);
  360 + GTK_WIDGET_UNSET_FLAGS(keypad->table,GTK_CAN_DEFAULT);
361 361 #endif // GTK(2,18)
362 362  
363 363 keypad->num_rows = 0;
364 364 g_list_foreach(keypad->rows,(GFunc) create_row,keypad);
  365 +#if GTK_CHECK_VERSION(2,28,0)
365 366 g_list_free_full(keypad->rows,g_free);
366   - gtk_box_pack_start(GTK_BOX(keypad->box),keypad->table,FALSE,FALSE,0);
  367 +#else
  368 + g_list_foreach(keypad->rows,(GFunc) g_free,NULL);
  369 + g_list_free(keypad->rows);
  370 +#endif // GTK(2,28)
  371 + gtk_box_pack_start(GTK_BOX(keypad->box),keypad->table,FALSE,FALSE,0);
367 372  
368 373 gtk_widget_show_all(keypad->box);
369 374 }
... ...