Download as
Browse Code »

Commit 9bfb9d93fc648e0e90922df1c3159405a0b58dd7

Authored by Perry Werneck
1 parent e3b26628
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para permitir uso em gtk2.

Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
src/pw3270/uiparser/keypad.c
  Diff comments   View file @9bfb9d9
... ... @@ -69,13 +69,11 @@
69 69 gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,width,height);
70 70  
71 71 #else
72   - guint r = 0, c = 0;
73   -
74   - gtk_table_get_size(keypad->grid,&r,&c);
  72 + guint r = keypad->rows, c = keypad->cols;
75 73  
76 74 if(r < keypad->row || c < (keypad->col+1)) {
77 75 trace("Resize to %u,%u to %u,%u",r,c,keypad->row,keypad->col+1);
78   - gtk_table_resize(keypad->grid,keypad->row,keypad->col+1);
  76 + gtk_table_resize(keypad->grid,keypad->rows = keypad->row,keypad->cols = (keypad->col+1));
79 77 }
80 78  
81 79 r = keypad->row-1;
... ... @@ -198,10 +196,11 @@
198 196 gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
199 197 gtk_grid_set_column_homogeneous(keypad->grid,TRUE);
200 198 #else
201   - keypad->grid = GTK_TABLE(gtk_table_new(1,1,TRUE));
  199 + keypad->rows = 1;
  200 + keypad->cols = 1;
  201 + keypad->grid = GTK_TABLE(gtk_table_new(keypad->rows,keypad->cols,TRUE));
202 202 #endif // GTK3
203 203  
204   -
205 204 g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos);
206 205  
207 206 label = ui_get_attribute("label",names,values);
... ...
src/pw3270/uiparser/keypad.h
  Diff comments   View file @9bfb9d9
... ... @@ -41,6 +41,8 @@
41 41 GtkGrid * grid;
42 42 #else
43 43 GtkTable * grid;
  44 + guint rows;
  45 + guint cols;
44 46 #endif // GTK3
45 47 GtkWidget * widget;
46 48 GtkReliefStyle relief;
... ...