Commit 9bfb9d93fc648e0e90922df1c3159405a0b58dd7
1 parent
e3b26628
Exists in
master
and in
5 other branches
Ajustes para permitir uso em gtk2.
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
src/pw3270/uiparser/keypad.c
| @@ -69,13 +69,11 @@ | @@ -69,13 +69,11 @@ | ||
| 69 | gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,width,height); | 69 | gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,width,height); |
| 70 | 70 | ||
| 71 | #else | 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 | if(r < keypad->row || c < (keypad->col+1)) { | 74 | if(r < keypad->row || c < (keypad->col+1)) { |
| 77 | trace("Resize to %u,%u to %u,%u",r,c,keypad->row,keypad->col+1); | 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 | r = keypad->row-1; | 79 | r = keypad->row-1; |
| @@ -198,10 +196,11 @@ | @@ -198,10 +196,11 @@ | ||
| 198 | gtk_grid_set_row_homogeneous(keypad->grid,TRUE); | 196 | gtk_grid_set_row_homogeneous(keypad->grid,TRUE); |
| 199 | gtk_grid_set_column_homogeneous(keypad->grid,TRUE); | 197 | gtk_grid_set_column_homogeneous(keypad->grid,TRUE); |
| 200 | #else | 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 | #endif // GTK3 | 202 | #endif // GTK3 |
| 203 | 203 | ||
| 204 | - | ||
| 205 | g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos); | 204 | g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos); |
| 206 | 205 | ||
| 207 | label = ui_get_attribute("label",names,values); | 206 | label = ui_get_attribute("label",names,values); |
src/pw3270/uiparser/keypad.h