correct access for virtuals

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 979e7b08bb35de947687ebec9061132a58aacca2..52b5643d2950ea80834be881445e25107f377ca2 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -23,10 +23,14 @@
 #endif
 
 #if wxUSE_UNICODE
 #endif
 
 #if wxUSE_UNICODE

-    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s)
-    #define wxGTK_CONV_SYS(s) wxGTK_CONV(s)
-    #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s)
+    #define wxGTK_CONV(s) wxConvUTF8.cWX2MB((s))
+    #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))

 #else
 #else

+    #include "wx/font.h"
+

     // convert the text in given encoding to UTF-8 used by wxGTK
     extern wxCharBuffer
     wxConvertToGTK(const wxString& s,
     // convert the text in given encoding to UTF-8 used by wxGTK
     extern wxCharBuffer
     wxConvertToGTK(const wxString& s,


@@ -39,9 +43,11 @@
                                            : wxFONTENCODING_SYSTEM);
     }
 
                                            : wxFONTENCODING_SYSTEM);
     }
 

-    #define wxGTK_CONV(s) wxConvertToGTK((s), m_font)
-    #define wxGTK_CONV_SYS(s) wxConvertToGTK(s)
-    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX( wxConvUTF8.cMB2WC((s)) )
+    #define wxGTK_CONV_ENC(s, enc) wxConvertToGTK((s), (enc))
+    #define wxGTK_CONV_FONT(s, font) wxConvertToGTK((s), (font))
+    #define wxGTK_CONV(s) wxGTK_CONV_FONT((s), m_font)
+    #define wxGTK_CONV_SYS(s) wxConvertToGTK((s))
+    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX(wxConvUTF8.cMB2WC((s)))

 #endif
 
 // Some deprecated GTK+ prototypes we still use often
 #endif
 
 // Some deprecated GTK+ prototypes we still use often