wxOS2 warning fixes after daily build log.

[wxWidgets.git] / src / gtk / utilsgtk.cpp

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4d780162b65bcf16c34789b9fbdb8c0adfb60e0d..6385e82fef512d86e83136e22a04f44dd00d840e 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -31,9 +31,6 @@
 #include "glib.h"
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
-#ifndef __WXGTK20__
-#include "gtk/gtkfeatures.h"
-#endif
 #include "gdk/gdkx.h"
 
 #ifdef HAVE_X11_XKBLIB_H
@@ -81,7 +78,6 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 }
 #endif
 
-#ifdef __WXGTK20__
 // Escapes string so that it is valid Pango markup XML string:
 wxString wxEscapeStringForPangoMarkup(const wxString& str)
 {
@@ -115,7 +111,6 @@ wxString wxEscapeStringForPangoMarkup(const wxString& str)
     }
     return out;
 }
-#endif
 
 
 // ----------------------------------------------------------------------------
@@ -168,11 +163,7 @@ int wxDisplayDepth()
 wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
 {
     static wxToolkitInfo info;
-#ifdef __WXGTK20__
     info.shortName = _T("gtk2");
-#else
-    info.shortName = _T("gtk");
-#endif
     info.name = _T("wxGTK");
 #ifdef __WXUNIVERSAL__
     info.shortName << _T("univ");