fix warnings in EventsSuppressor ctor from gcc with -O option

[wxWidgets.git] / include / wx / gtk / private.h

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index d19eed94ea93e96afbd471a19c386dd265ace82b..fa140d1cd3827afac309b3ef65a17b304faea780 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -34,12 +34,12 @@
 extern const gchar *wx_pango_version_check(int major, int minor, int micro);
 
 #if wxUSE_UNICODE
-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB((s))
+    #define wxGTK_CONV(s) s.utf8_str()
     #define wxGTK_CONV_ENC(s, enc) wxGTK_CONV((s))
     #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s))
     #define wxGTK_CONV_SYS(s) wxGTK_CONV((s))
 
-    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX((s))
+    #define wxGTK_CONV_BACK(s) wxString::FromUTF8(s)
     #define wxGTK_CONV_BACK_ENC(s, enc) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_FONT(s, font) wxGTK_CONV_BACK(s)
     #define wxGTK_CONV_BACK_SYS(s) wxGTK_CONV_BACK(s)
@@ -47,11 +47,11 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro);
     #include "wx/font.h"
 
     // convert the text between the given encoding and UTF-8 used by wxGTK
-    extern wxCharBuffer
+    extern WXDLLIMPEXP_CORE wxCharBuffer
     wxConvertToGTK(const wxString& s,
                    wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 
-    extern wxCharBuffer
+    extern WXDLLIMPEXP_CORE wxCharBuffer
     wxConvertFromGTK(const wxString& s,
                      wxFontEncoding enc = wxFONTENCODING_SYSTEM);