From 1911bca8165e6a3426ed8af1718ace7e8a4ad850 Mon Sep 17 00:00:00 2001
From: Perry Werneck <perry.werneck@gmail.com>
Date: Wed, 19 Oct 2016 09:45:33 -0200
Subject: [PATCH] - Fix para o bug 998842 (https://bugzilla.suse.com/show_bug.cgi?id=998842) causou problemas na compilação gtk2; corrigindo

---
 src/pw3270/uiparser/keypad.c | 32 +++++++++++++++++++++++++++++++-
 src/pw3270/uiparser/keypad.h | 32 ++++----------------------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/pw3270/uiparser/keypad.c b/src/pw3270/uiparser/keypad.c
index 7f86c4b..8d6f688 100644
--- a/src/pw3270/uiparser/keypad.c
+++ b/src/pw3270/uiparser/keypad.c
@@ -64,7 +64,32 @@
 			keypad->col = atoi(tmp);
 		}
 
+#if GTK_CHECK_VERSION(3,0,0)
+
 		gtk_grid_attach(keypad->grid,keypad->widget,keypad->col,keypad->row,width,height);
+
+#else
+		guint r = 0, c = 0;
+
+		gtk_table_get_size(keypad->grid,&r,&c);
+
+		if(r < keypad->row || c < (keypad->col+1)) {
+			trace("Resize to %u,%u to %u,%u",r,c,keypad->row,keypad->col+1);
+			gtk_table_resize(keypad->grid,keypad->row,keypad->col+1);
+		}
+
+		r = keypad->row-1;
+		c = keypad->col;
+
+		gtk_table_attach(	keypad->grid,
+							keypad->widget,
+							c,c+width,
+							r,r+height,
+							GTK_EXPAND|GTK_FILL,
+							GTK_EXPAND|GTK_FILL,
+							1,1);
+#endif
+
 		keypad->widget = NULL;
 
  	}
@@ -167,10 +192,15 @@
 	keypad->parser 		= info;
 	keypad->pos			= ui_get_position_attribute(names,values);
 	keypad->relief		= ui_get_relief(names, values, GTK_RELIEF_NORMAL);
-	keypad->grid		= GTK_GRID(gtk_grid_new());
 
+#if GTK_CHECK_VERSION(3,0,0)
+	keypad->grid		= GTK_GRID(gtk_grid_new());
 	gtk_grid_set_row_homogeneous(keypad->grid,TRUE);
 	gtk_grid_set_column_homogeneous(keypad->grid,TRUE);
+#else
+	keypad->grid		= GTK_TABLE(gtk_table_new(1,1,TRUE));
+#endif	// GTK3
+
 
 	g_object_set_data(G_OBJECT(keypad->grid),"position",(gpointer) keypad->pos);
 
diff --git a/src/pw3270/uiparser/keypad.h b/src/pw3270/uiparser/keypad.h
index 3090514..38b9bc5 100644
--- a/src/pw3270/uiparser/keypad.h
+++ b/src/pw3270/uiparser/keypad.h
@@ -37,38 +37,14 @@
 	struct parser		* parser;
 	unsigned short		  row;
 	unsigned short		  col;
+#if GTK_CHECK_VERSION(3,0,0)
 	GtkGrid				* grid;
+#else
+	GtkTable			* grid;
+#endif // GTK3
 	GtkWidget			* widget;
 	GtkReliefStyle		  relief;
 	UI_ATTR_DIRECTION	  pos;
  };
 
-/*
- struct row
- {
- 	unsigned short		  pos;
- 	unsigned short		  num_cols;
-	GList				* cols;
- };
-
- struct keypad
- {
-	struct parser		* parser;
-	unsigned short		  num_rows;
-	unsigned short	  	  num_cols;
-	unsigned short		  col;
-	unsigned short		  button_width;
-	struct row			* row;
-	GtkWidget			* box;
-	GtkWidget			* handle;
-	GtkWidget			* table;
-	GtkReliefStyle		  relief;
-	UI_ATTR_DIRECTION	  pos;
-	GList				* rows;
-
-	GtkWidget			* widget;
-
- };
-*/
-
  G_GNUC_INTERNAL void keypad_button_start(GMarkupParseContext *context, const gchar **names,const gchar **values, GError **error, struct keypad *keypad);
--
libgit2 0.21.2