[ 1579793 ] numerous bug fixes when mask is used

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

diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp
index 4d780162b65bcf16c34789b9fbdb8c0adfb60e0d..ae645105e1eac2bb6ffd34f7fac05ddc54fb3d4d 100644 (file)
--- a/src/gtk/utilsgtk.cpp
+++ b/src/gtk/utilsgtk.cpp
@@ -11,11 +11,14 @@
 #include "wx/wxprec.h"
 
 #include "wx/utils.h"
-#include "wx/string.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+#endif
 
 #include "wx/apptrait.h"
-#include "wx/intl.h"
-#include "wx/log.h"
 
 #include "wx/process.h"
 
@@ -31,9 +34,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
@@ -72,16 +72,15 @@ bool wxSetDetectableAutoRepeat( bool flag )
 {
     Bool result;
     XkbSetDetectableAutoRepeat( GDK_DISPLAY(), flag, &result );
-    return result;       /* TRUE if keyboard hardware supports this mode */
+    return result;       /* true if keyboard hardware supports this mode */
 }
 #else
 bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) )
 {
-    return FALSE;
+    return false;
 }
 #endif
 
-#ifdef __WXGTK20__
 // Escapes string so that it is valid Pango markup XML string:
 wxString wxEscapeStringForPangoMarkup(const wxString& str)
 {
@@ -115,7 +114,6 @@ wxString wxEscapeStringForPangoMarkup(const wxString& str)
     }
     return out;
 }
-#endif
 
 
 // ----------------------------------------------------------------------------
@@ -157,38 +155,70 @@ void wxGetMousePosition( int* x, int* y )
 
 bool wxColourDisplay()
 {
-    return TRUE;
+    return true;
 }
 
 int wxDisplayDepth()
 {
-    return gdk_window_get_visual( wxGetRootWindow()->window )->depth;
+    return gdk_drawable_get_visual( wxGetRootWindow()->window )->depth;
 }
 
-wxToolkitInfo& wxGUIAppTraits::GetToolkitInfo()
+wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
 {
-    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");
-    info.name << _T("/wxUniversal");
-#endif
-    info.versionMajor = gtk_major_version;
-    info.versionMinor = gtk_minor_version;
-    info.os = wxGTK;
-    return info;
+    return wxGenericFindWindowAtPoint(pt);
 }
 
-wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
+#if !wxUSE_UNICODE
+
+wxCharBuffer wxConvertToGTK(const wxString& s, wxFontEncoding enc)
 {
-    return wxGenericFindWindowAtPoint(pt);
+    wxCharBuffer buf;
+    if ( enc == wxFONTENCODING_UTF8 )
+    {
+        // no need for conversion at all, but do check that we have a valid
+        // UTF-8 string because passing invalid UTF-8 to GTK+ is going to
+        // result in a GTK+ error message and, especially, loss of data which
+        // was supposed to be shown in the GUI
+        if ( wxConvUTF8.ToWChar(NULL, 0, s, s.length()) == wxCONV_FAILED )
+        {
+            // warn the programmer that something is probably wrong in his code
+            //
+            // NB: don't include the string in output because chances are that
+            //     this invalid UTF-8 string could result in more errors itself
+            //     if the application shows logs in the GUI and so we get into
+            //     an infinite loop
+            wxLogDebug(_T("Invalid UTF-8 string in wxConvertToGTK()"));
+
+            // but still try to show at least something on the screen
+            wxMBConvUTF8 utf8permissive(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL);
+            wxWCharBuffer wbuf(utf8permissive.cMB2WC(s));
+            buf = wxConvUTF8.cWC2MB(wbuf);
+        }
+        else // valid UTF-8 string, no need to convert
+        {
+            buf = wxCharBuffer(s);
+        }
+    }
+    else // !UTF-8
+    {
+        wxWCharBuffer wbuf;
+        if ( enc == wxFONTENCODING_SYSTEM || enc == wxFONTENCODING_DEFAULT )
+        {
+            wbuf = wxConvUI->cMB2WC(s);
+        }
+        else // another encoding, use generic conversion class
+        {
+            wbuf = wxCSConv(enc).cMB2WC(s);
+        }
+
+        if ( wbuf )
+            buf = wxConvUTF8.cWC2MB(wbuf);
+    }
+
+    return buf;
 }
 
+#endif // !wxUSE_UNICODE
 
 // ----------------------------------------------------------------------------
 // subprocess routines
@@ -238,3 +268,18 @@ int wxAddProcessCallback(wxEndProcessData *proc_data, int fd)
     return tag;
 }
 
+
+
+// ----------------------------------------------------------------------------
+// wxPlatformInfo-related
+// ----------------------------------------------------------------------------
+
+wxPortId wxGUIAppTraits::GetToolkitVersion(int *verMaj, int *verMin) const
+{
+    if ( verMaj )
+        *verMaj = gtk_major_version;
+    if ( verMin )
+        *verMin = gtk_minor_version;
+
+    return wxPORT_GTK;
+}