Download as
Browse Code »

Commit 1911bca8165e6a3426ed8af1718ace7e8a4ad850

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

- Fix para o bug 998842 (https://bugzilla.suse.com/show_bug.cgi?id=998842) causo… 

…u problemas na compilação gtk2; corrigindo
Showing 2 changed files with 35 additions and 29 deletions   Show diff stats
src/pw3270/uiparser/keypad.c
  Diff comments   View file @1911bca
@@ -64,7 +64,32 @@ @@ -64,7 +64,32 @@
64 keypad->col = atoi(tmp); 64 keypad->col = atoi(tmp);
65 } 65 }
66 66
  67 +#if GTK_CHECK_VERSION(3,0,0)
  68 +
67 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 +
  71 +#else
  72 + guint r = 0, c = 0;
  73 +
  74 + gtk_table_get_size(keypad->grid,&r,&c);
  75 +
  76 + if(r < keypad->row || c < (keypad->col+1)) {
  77 + 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);
  79 + }
  80 +
  81 + r = keypad->row-1;
  82 + c = keypad->col;
  83 +
  84 + gtk_table_attach( keypad->grid,
  85 + keypad->widget,
  86 + c,c+width,
  87 + r,r+height,
  88 + GTK_EXPAND|GTK_FILL,
  89 + GTK_EXPAND|GTK_FILL,
  90 + 1,1);
  91 +#endif
  92 +
68 keypad->widget = NULL; 93 keypad->widget = NULL;
69 94
70 } 95 }
@@ -167,10 +192,15 @@ @@ -167,10 +192,15 @@
167 keypad->parser = info; 192 keypad->parser = info;
168 keypad->pos = ui_get_position_attribute(names,values); 193 keypad->pos = ui_get_position_attribute(names,values);
169 keypad->relief = ui_get_relief(names, values, GTK_RELIEF_NORMAL); 194 keypad->relief = ui_get_relief(names, values, GTK_RELIEF_NORMAL);
170 - keypad->grid = GTK_GRID(gtk_grid_new());  
171 195
  196 +#if GTK_CHECK_VERSION(3,0,0)
  197 + keypad->grid = GTK_GRID(gtk_grid_new());
172 gtk_grid_set_row_homogeneous(keypad->grid,TRUE); 198 gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
173 gtk_grid_set_column_homogeneous(keypad->grid,TRUE); 199 gtk_grid_set_column_homogeneous(keypad->grid,TRUE);
  200 +#else
  201 + keypad->grid = GTK_TABLE(gtk_table_new(1,1,TRUE));
  202 +#endif // GTK3
  203 +
174 204
175 g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos); 205 g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos);
176 206
src/pw3270/uiparser/keypad.h
  Diff comments   View file @1911bca
@@ -37,38 +37,14 @@ @@ -37,38 +37,14 @@
37 struct parser * parser; 37 struct parser * parser;
38 unsigned short row; 38 unsigned short row;
39 unsigned short col; 39 unsigned short col;
  40 +#if GTK_CHECK_VERSION(3,0,0)
40 GtkGrid * grid; 41 GtkGrid * grid;
  42 +#else
  43 + GtkTable * grid;
  44 +#endif // GTK3
41 GtkWidget * widget; 45 GtkWidget * widget;
42 GtkReliefStyle relief; 46 GtkReliefStyle relief;
43 UI_ATTR_DIRECTION pos; 47 UI_ATTR_DIRECTION pos;
44 }; 48 };
45 49
46 -/*  
47 - struct row  
48 - {  
49 - unsigned short pos;  
50 - unsigned short num_cols;  
51 - GList * cols;  
52 - };  
53 -  
54 - struct keypad  
55 - {  
56 - struct parser * parser;  
57 - unsigned short num_rows;  
58 - unsigned short num_cols;  
59 - unsigned short col;  
60 - unsigned short button_width;  
61 - struct row * row;  
62 - GtkWidget * box;  
63 - GtkWidget * handle;  
64 - GtkWidget * table;  
65 - GtkReliefStyle relief;  
66 - UI_ATTR_DIRECTION pos;  
67 - GList * rows;  
68 -  
69 - GtkWidget * widget;  
70 -  
71 - };  
72 -*/  
73 -  
74 G_GNUC_INTERNAL void keypad_button_start(GMarkupParseContext *context, const gchar **names,const gchar **values, GError **error, struct keypad *keypad); 50 G_GNUC_INTERNAL void keypad_button_start(GMarkupParseContext *context, const gchar **names,const gchar **values, GError **error, struct keypad *keypad);