X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cef1b4ab6f98e03a0e974e498fdb22fb88cc727..374e9b153fcb3f4e547929ccc9b80bda76fd6f6e:/include/wx/gtk/private.h

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 979e7b08bb..c689eaa55d 100644
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -23,10 +23,14 @@
 #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
+    #include "wx/font.h"
+
     // convert the text in given encoding to UTF-8 used by wxGTK
     extern wxCharBuffer
     wxConvertToGTK(const wxString& s,
@@ -39,9 +43,11 @@
                                            : 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
@@ -94,47 +100,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxGtkString)
 };
 
-//-----------------------------------------------------------------------------
-// GTK+ scroll types -> wxEventType
-//-----------------------------------------------------------------------------
-
-// translate a GTK+ scroll type to a wxEventType
-inline wxEventType GtkScrollTypeToWx(guint scrollType)
-{
-    wxEventType command;
-    switch ( scrollType )
-    {
-        case GTK_SCROLL_STEP_BACKWARD:
-            command = wxEVT_SCROLL_LINEUP;
-            break;
-
-        case GTK_SCROLL_STEP_FORWARD:
-            command = wxEVT_SCROLL_LINEDOWN;
-            break;
-
-        case GTK_SCROLL_PAGE_BACKWARD:
-            command = wxEVT_SCROLL_PAGEUP;
-            break;
-
-        case GTK_SCROLL_PAGE_FORWARD:
-            command = wxEVT_SCROLL_PAGEDOWN;
-            break;
-
-        default:
-            command = wxEVT_SCROLL_THUMBTRACK;
-    }
-
-    return command;
-}
-
-inline wxEventType GtkScrollWinTypeToWx(guint scrollType)
-{
-    // GtkScrollTypeToWx() returns SCROLL_XXX, not SCROLLWIN_XXX as we need
-    return GtkScrollTypeToWx(scrollType) +
-            wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP;
-}
-
-
 //-----------------------------------------------------------------------------
 // Misc. functions
 //-----------------------------------------------------------------------------