Index: src/af/xap/gtk/xap_UnixDialogHelper.cpp
===================================================================
--- src/af/xap/gtk/xap_UnixDialogHelper.cpp	(revision 30512)
+++ src/af/xap/gtk/xap_UnixDialogHelper.cpp	(working copy)
@@ -50,6 +50,7 @@
 #include "xap_App.h"
 #include "xap_UnixDialogHelper.h"
 #include "xap_Dialog.h"
+#include "xap_Gtk2Compat.h"
 
 /*****************************************************************/
 /*****************************************************************/
Index: src/af/xap/gtk/xap_Gtk2Compat.h
===================================================================
--- src/af/xap/gtk/xap_Gtk2Compat.h	(revision 30512)
+++ src/af/xap/gtk/xap_Gtk2Compat.h	(working copy)
@@ -28,17 +28,34 @@
 #include <gdk/gdkkeysyms.h>
 #endif
 
+// keynames 
+#if GTK_CHECK_VERSION(2,22,0)
 #include <gdk/gdkkeysyms-compat.h>
-// keynames 
-#if !GTK_CHECK_VERSION(2,22,0)
+#else
+#define GDK_KEY_3270_Enter   GDK_3270_Enter
+#define GDK_KEY_BackSpace    GDK_BackSpace
 #define GDK_KEY_Delete       GDK_Delete
-#define GDK_KEY_BackSpace    GDK_BackSpace
-#define GDK_KEY_Left         GDK_Left
-#define GDK_KEY_VoidSymbol   GDK_VoidSymbol
-#define GDK_KEY_Right        GDK_Right
+#define GDK_KEY_Down         GDK_Down
+#define GDK_KEY_Escape       GDK_Escape
+#define GDK_KEY_F1           GDK_F1
+#define GDK_KEY_Help         GDK_Help
+#define GDK_KEY_ISO_Enter    GDK_ISO_Enter
 #define GDK_KEY_KP_0         GDK_KP_0 
 #define GDK_KEY_KP_9         GDK_KP_9
+#define GDK_KEY_KP_Down      GDK_KP_Down
 #define GDK_KEY_KP_Enter     GDK_KP_Enter
+#define GDK_KEY_KP_Escape    GDK_KP_Escape
+#define GDK_KEY_KP_Left      GDK_KP_Left
+#define GDK_KEY_KP_Right     GDK_KP_Right
+#define GDK_KEY_KP_Space     GDK_KP_Space
+#define GDK_KEY_KP_Up        GDK_KP_Up
+#define GDK_KEY_Left         GDK_Left
+#define GDK_KEY_Return       GDK_Return
+#define GDK_KEY_Right        GDK_Right
+#define GDK_KEY_space        GDK_space
+#define GDK_KEY_Tab          GDK_Tab
+#define GDK_KEY_Up           GDK_Up
+#define GDK_KEY_VoidSymbol   GDK_VoidSymbol
 #endif
 
 
@@ -142,6 +159,7 @@
 #if !GTK_CHECK_VERSION(2,24,0)
 
 #define GTK_COMBO_BOX_TEXT GTK_COMBO_BOX
+#define GtkComboBoxText    GtkComboBox
 
 inline GtkWidget* gtk_combo_box_text_new()
 {
@@ -162,6 +180,22 @@
 {
   return gtk_combo_box_get_active_text(combo);
 }
+
+inline void gtk_combo_box_text_remove(GtkComboBox* combo, gint position)
+{
+  gtk_combo_box_remove_text(combo, position);
+}
+
+inline GtkWidget * gtk_combo_box_new_with_model_and_entry(GtkTreeModel *model)
+{
+  return gtk_combo_box_entry_new_with_model(model,0);
+}
+
+inline GdkDisplay * gdk_window_get_display (GdkWindow *window)
+{
+  g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
+  return gdk_drawable_get_display (GDK_DRAWABLE (window));
+}
 #endif
 
 #if !GTK_CHECK_VERSION(3,0,0)
Index: src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.h
===================================================================
--- src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.h	(revision 30512)
+++ src/wp/ap/gtk/ap_UnixDialog_FormatFootnotes.h	(working copy)
@@ -21,6 +21,7 @@
 #define AP_UNIXDIALOG_FORMATFOOTNOTES_H
 
 #include "ap_Dialog_FormatFootnotes.h"
+#include "xap_Gtk2Compat.h"
 
 class XAP_UnixFrame;
 
Index: src/wp/ap/gtk/GTKCommon.h
===================================================================
--- src/wp/ap/gtk/GTKCommon.h	(revision 30512)
+++ src/wp/ap/gtk/GTKCommon.h	(working copy)
@@ -24,6 +24,7 @@
 #include <string>
 #include <list>
 #include <gtk/gtk.h>
+#include "xap_Gtk2Compat.h"
 
 std::string tostr( long v );
 std::string tostr( GtkTextView* tv );
Index: src/wp/ap/gtk/ap_UnixDialog_Styles.cpp
===================================================================
--- src/wp/ap/gtk/ap_UnixDialog_Styles.cpp	(revision 30512)
+++ src/wp/ap/gtk/ap_UnixDialog_Styles.cpp	(working copy)
@@ -39,6 +39,7 @@
 #include "ut_string_class.h"
 
 #include "gr_UnixCairoGraphics.h"
+#include "xap_Gtk2Compat.h"
 
 // define to 0 to popup dialogs on top of each other, 1 to hide them
 #define HIDE_MAIN_DIALOG 0
Index: src/wp/ap/gtk/ap_UnixDialog_Tab.cpp
===================================================================
--- src/wp/ap/gtk/ap_UnixDialog_Tab.cpp	(revision 30512)
+++ src/wp/ap/gtk/ap_UnixDialog_Tab.cpp	(working copy)
@@ -45,6 +45,7 @@
 #include "ap_Strings.h"
 
 #include "ap_UnixDialog_Tab.h"
+#include "xap_Gtk2Compat.h"
 
 //! Column indices for list-store
 enum {