Added wxEnableTopLevelWindows(bool enable) for use by wxSafeYield().

[wxWidgets.git] / src / common / string.cpp

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 4d806122807b084dbaf9580f99e245f233bbd408..ba38f0559a0cccb5512dc3cc5b2867ed07661030 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1842,7 +1842,7 @@ size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // standard gdk conversion
 // ----------------------------------------------------------------------------
 
 // standard gdk conversion
 // ----------------------------------------------------------------------------
 

-#ifdef __WXGTK__
+#if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)

 WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk;
 
 #include <gdk/gdk.h>
 WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk;
 
 #include <gdk/gdk.h>


@@ -1870,7 +1870,7 @@ size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
   }
   return len;
 }
   }
   return len;
 }

-#endif
+#endif // GTK > 1.0

 
 // ----------------------------------------------------------------------------
 // UTF-7
 
 // ----------------------------------------------------------------------------
 // UTF-7