Remove remnants of GTK+ 2 support

GTK+ 3 is now required to build Poedit.

This was probably the case in practice already…

Author: vslavik

configure.ac

@@ -191,28 +191,13 @@ AC_COMPILE_IFELSE(
     ])],
     [
         AC_MSG_RESULT([yes])
-        gtkspell_packages="gtkspell3-3.0 gtk+-3.0"
     ],
     [
         AC_MSG_RESULT([no])
-        AC_MSG_CHECKING([if wxWidgets toolkit uses GTK+ 2])
-        AC_COMPILE_IFELSE(
-            [AC_LANG_PROGRAM([#include <wx/defs.h>], [
-                #ifndef __WXGTK20__
-                    #error "not GTK+ 2"
-                #endif
-            ])],
-            [
-                AC_MSG_RESULT([yes])
-                gtkspell_packages="gtkspell-2.0 gtk+-2.0 >= 2.20"
-            ],
-            [
-                AC_MSG_RESULT([no])
-                AC_MSG_ERROR([GTK+ build of wxWidgets is required])
-            ])
+        AC_MSG_ERROR([GTK3+ build of wxWidgets is required])
     ])
 
-PKG_CHECK_MODULES([GTKSPELL], [$gtkspell_packages],
+PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 gtk+-3.0],
     [
         CXXFLAGS="$CXXFLAGS $GTKSPELL_CFLAGS"
         LIBS="$LIBS $GTKSPELL_LIBS"

src/icons.cpp

@@ -46,26 +46,6 @@
 namespace
 {
 
-#if defined(__WXGTK20__) && !defined(__WXGTK3__)
-// translates poedit item id or Tango stock item id to "legacy" GNOME id:
-wxString GetGnomeStockId(const wxString& id)
-{
-    #define MAP(poedit, gnome) if ( id == _T(poedit) ) return _T(gnome)
-
-    MAP("document-open",        "gtk-open");
-    MAP("document-save",        "gtk-save");
-    MAP("window-close",         "gtk-close");
-
-    MAP("folder-open@symbolic", "gtk-jump-to");
-    MAP("list-add@symbolic",    "list-add");
-    MAP("list-remove@symbolic", "list-remove");
-
-    #undef MAP
-
-    return wxEmptyString; // no match found
-}
-#endif // __WXGTK20__
-
 // Check if a given icon needs mirroring in right-to-left locales:
 bool ShouldBeMirorredInRTL(const wxArtID& id, const wxArtClient& client)
 {
@@ -180,18 +160,6 @@ wxBitmap PoeditArtProvider::CreateBitmap(const wxArtID& id_,
     //       theme provider (that uses current icon theme and files from
     //       /usr/share/icons/<theme>) didn't find any matching icon.
 
-#if defined(__WXGTK20__) && !defined(__WXGTK3__)
-    // try legacy GNOME icons from standard theme:
-    wxString gnomeId = GetGnomeStockId(id);
-    if ( !gnomeId.empty() )
-    {
-        wxLogTrace("poedit.icons", "-> legacy '%s'", gnomeId.c_str());
-        wxBitmap gbmp(wxArtProvider::GetBitmap(gnomeId, client, size));
-        if ( gbmp.Ok() )
-            return gbmp;
-    }
-#endif // defined(__WXGTK20__) && !defined(__WXGTK3__)
-
 #ifdef __WXGTK3__
     CHECK_FOR_VARIANT(symbolic);
     if (symbolicVariant)

src/icons.h

@@ -28,10 +28,6 @@
 
 #include <wx/artprov.h>
 
-#if defined(__WXGTK20__)
-    #define HAS_THEMES_SUPPORT
-#endif
-
 #ifndef __WXOSX__
 class PoeditArtProvider : public wxArtProvider
 {

src/wx/main_toolbar.cpp

@@ -38,7 +38,7 @@
 #include <wx/msw/uxtheme.h>
 #endif
 
-#ifdef __WXGTK__
+#ifdef __WXGTK3__
 #include <gtk/gtk.h>
 #endif