implement event loop for console applications (heavily modified patch 1715735)

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

diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h
index 7352f87369905e4896f4c2151e9d110d624591a7..d19eed94ea93e96afbd471a19c386dd265ace82b 100644 (file)
--- a/include/wx/gtk/private.h
+++ b/include/wx/gtk/private.h
@@ -23,20 +23,38 @@
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 
     #define GTK_CHECK_VERSION(a, b, c) 0
 #endif
 

+// pango_version_check symbol is quite recent ATM (4/2007)... so we
+// use our own wrapper which implements a smart trick.
+// Use this function as you'd use pango_version_check:
+//
+//  if (!wx_pango_version_check(1,18,0))
+//     ... call to a function available only in pango >= 1.18 ...
+//
+// and use it only to test for pango versions >= 1.16.0
+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_ENC(s, enc) wxGTK_CONV((s))
     #define wxGTK_CONV_FONT(s, font) wxGTK_CONV((s))
     #define wxGTK_CONV_SYS(s) wxGTK_CONV((s))
 #if wxUSE_UNICODE
     #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))
     #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX((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)

 #else
     #include "wx/font.h"
 
 #else
     #include "wx/font.h"
 

-    // convert the text in given encoding to UTF-8 used by wxGTK
+    // convert the text between the given encoding and UTF-8 used by wxGTK

     extern wxCharBuffer
     wxConvertToGTK(const wxString& s,
                    wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 
     extern wxCharBuffer
     wxConvertToGTK(const wxString& s,
                    wxFontEncoding enc = wxFONTENCODING_SYSTEM);
 

+    extern wxCharBuffer
+    wxConvertFromGTK(const wxString& s,
+                     wxFontEncoding enc = wxFONTENCODING_SYSTEM);
+

     // helper: use the encoding of the given font if it's valid
     inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font)
     {
     // helper: use the encoding of the given font if it's valid
     inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font)
     {


@@ -44,11 +62,35 @@
                                            : wxFONTENCODING_SYSTEM);
     }
 
                                            : wxFONTENCODING_SYSTEM);
     }
 

+    inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font)
+    {
+        return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding()
+                                             : wxFONTENCODING_SYSTEM);
+    }
+
+    // more helpers: allow passing GTK+ strings directly
+    inline wxCharBuffer
+    wxConvertFromGTK(const wxGtkString& gs,
+                     wxFontEncoding enc = wxFONTENCODING_SYSTEM)
+    {
+        return wxConvertFromGTK(gs.c_str(), enc);
+    }
+
+    inline wxCharBuffer
+    wxConvertFromGTK(const wxGtkString& gs, const wxFont& font)
+    {
+        return wxConvertFromGTK(gs.c_str(), font);
+    }
+
+    #define wxGTK_CONV(s) wxGTK_CONV_FONT((s), m_font)

     #define wxGTK_CONV_ENC(s, enc) wxConvertToGTK((s), (enc))
     #define wxGTK_CONV_FONT(s, font) wxConvertToGTK((s), (font))
     #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_SYS(s) wxConvertToGTK((s))

-    #define wxGTK_CONV_BACK(s)  wxConvLocal.cWC2WX(wxConvUTF8.cMB2WC((s)))
+
+    #define wxGTK_CONV_BACK(s) wxConvertFromGTK((s), m_font)
+    #define wxGTK_CONV_BACK_ENC(s, enc) wxConvertFromGTK((s), (enc))
+    #define wxGTK_CONV_BACK_FONT(s, font) wxConvertFromGTK((s), (font))
+    #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s))

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


@@ -74,13 +116,6 @@ void gtk_window_set_policy (GtkWindow *window,
 
 G_END_DECLS
 
 
 G_END_DECLS
 

-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-

 //-----------------------------------------------------------------------------
 // Misc. functions
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Misc. functions
 //-----------------------------------------------------------------------------