[dasher: 117/217] Remove support for gtk+ versions older than 2.14

[Patrick Welche <pwelche src gnome org>]

commit 32ef2819410369eb90af8dc6f56531ffa87cdef8
Author: David Barnett <dbarnett google com>
Date:   Mon Nov 9 23:55:38 2015 -0800

    Remove support for gtk+ versions older than 2.14

 Src/Gtk2/Canvas.cpp                 |    8 --------
 Src/Gtk2/DasherControl.cpp          |    8 +-------
 Src/Gtk2/dasher_editor.cpp          |    5 -----
 Src/Gtk2/module_settings_window.cpp |    4 ----
 configure.ac                        |    2 +-
 5 files changed, 2 insertions(+), 25 deletions(-)
---
diff --git a/Src/Gtk2/Canvas.cpp b/Src/Gtk2/Canvas.cpp
index a62219d..84e76ce 100644
--- a/Src/Gtk2/Canvas.cpp
+++ b/Src/Gtk2/Canvas.cpp
@@ -176,11 +176,7 @@ void CCanvas::Display() {
 
 #if WITH_CAIRO  
   cairo_t *widget_cr;
-#if GTK_CHECK_VERSION (2,14,0)
   widget_cr = gdk_cairo_create(gtk_widget_get_window(m_pCanvas));
-#else
-  widget_cr = gdk_cairo_create(m_pCanvas->window);
-#endif
   cairo_set_source_surface(widget_cr, m_pDecorationSurface, 0, 0);
   cairo_rectangle(widget_cr, 0, 0, GetWidth(), GetHeight());
   cairo_fill(widget_cr);
@@ -566,11 +562,7 @@ bool CCanvas::GetCanvasSize(GdkRectangle *pRectangle)
   int iX = 0;
   int iY = 0;
 
-#if GTK_CHECK_VERSION (2,14,0)
   gdk_window_get_position(gtk_widget_get_window(m_pCanvas), &iX, &iY);
-#else
-  gdk_window_get_position(m_pCanvas->window, &iX, &iY);
-#endif
 
   pRectangle->x       = iX;
   pRectangle->y       = iY;
diff --git a/Src/Gtk2/DasherControl.cpp b/Src/Gtk2/DasherControl.cpp
index fa6b480..80d9074 100644
--- a/Src/Gtk2/DasherControl.cpp
+++ b/Src/Gtk2/DasherControl.cpp
@@ -461,13 +461,7 @@ void CDasherControl::ExternalKeyUp(int iKeyVal) {
 int CDasherControl::TimerEvent() {
   int x, y;
   GdkWindow *default_root_window = gdk_get_default_root_window();
-  GdkWindow *window;
-
-#if GTK_CHECK_VERSION (2,14,0)
-  window = gtk_widget_get_window(m_pCanvas);
-#else
-  window = m_pCanvas->window;
-#endif
+  GdkWindow *window = gtk_widget_get_window(m_pCanvas);
 
 #if GTK_CHECK_VERSION (3,0,0)
   GdkDeviceManager *device_manager =
diff --git a/Src/Gtk2/dasher_editor.cpp b/Src/Gtk2/dasher_editor.cpp
index f06e373..715b744 100644
--- a/Src/Gtk2/dasher_editor.cpp
+++ b/Src/Gtk2/dasher_editor.cpp
@@ -334,12 +334,7 @@ dasher_editor_internal_create_buffer(DasherEditor *pSelf) {
 
   pPrivate->pOutputTag = gtk_text_buffer_create_tag(pPrivate->pBuffer, NULL, NULL);
 
-#if GTK_CHECK_VERSION(2,8,0)
   pPrivate->pHiddenTag = gtk_text_buffer_create_tag(pPrivate->pBuffer, NULL, "invisible", TRUE, NULL);
-#else
-  // TODO: We really ought to do something a little more sensible with conversion in GTK < 2.8
-  pPrivate->pHiddenTag = gtk_text_buffer_create_tag(pPrivate->pBuffer, NULL, NULL);
-#endif
 
   pPrivate->pVisibleTag = gtk_text_buffer_create_tag(pPrivate->pBuffer, NULL, "foreground", "red", NULL);
 
diff --git a/Src/Gtk2/module_settings_window.cpp b/Src/Gtk2/module_settings_window.cpp
index ca03f21..e20e3d2 100644
--- a/Src/Gtk2/module_settings_window.cpp
+++ b/Src/Gtk2/module_settings_window.cpp
@@ -97,11 +97,7 @@ module_settings_window_new(DasherAppSettings *pAppSettings, const gchar *szName,
 
   g_free(szFrameTitle);
 
-#if GTK_CHECK_VERSION (2,14,0)
   gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area(&(pDasherControl->window))), pFrame);
-#else
-  gtk_container_add(GTK_CONTAINER(pDasherControl->window.vbox), pFrame);
-#endif
   g_object_set(G_OBJECT(pFrame), "border-width", 8, NULL);
 
   GtkWidget *pTable = gtk_table_new(iCount, 2, FALSE);
diff --git a/configure.ac b/configure.ac
index 7c0036a..edb7fc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -188,7 +188,7 @@ if test x"$WITHGTK" = xtrue
 then 
        PKG_CHECK_MODULES(GTK, gtk+-3.0,
                [GTKHERE=true],
-               [PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.6.0,
+               [PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.14.0,
                        [GTKHERE=true],
                        [GTKHERE=false])]) 
 fi