#include <gtk/gtk.h>
-#include "wx/event.h"
-
-// fail all version tests if the GTK+ version is so ancient that it doesn't
-// even have GTK_CHECK_VERSION
-#ifndef GTK_CHECK_VERSION
- #define GTK_CHECK_VERSION(a, b, c) 0
-#endif
+#include "wx/gtk/private/string.h"
+
+// 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_SYS(s, enc) wxGTK_CONV(s)
- #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(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) 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)
#else
- // convert the text in given encoding to UTF-8 used by wxGTK
- extern wxCharBuffer
+ #include "wx/font.h"
+
+ // convert the text between the given encoding and UTF-8 used by wxGTK
+ extern WXDLLIMPEXP_CORE wxCharBuffer
wxConvertToGTK(const wxString& s,
wxFontEncoding enc = wxFONTENCODING_SYSTEM);
+ extern WXDLLIMPEXP_CORE 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)
{
: 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)) )
+ 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_SYS(s) wxConvertToGTK((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
// FIXME: Don't use them if possible.
-G_BEGIN_DECLS
-
-// Should use gtk_image_new, but the mask seems to be handled different,
-// and we need to migrate
-GtkWidget* gtk_pixmap_new (GdkPixmap *pixmap,
- GdkBitmap *mask);
+extern "C" {
// Deprecated since GTK+-1.3.7:
// Trivial wrapper around gtk_window_move, with some side effects we seem to rely on
gint allow_grow,
gint auto_shrink);
-G_END_DECLS
-
-//-----------------------------------------------------------------------------
-// idle system
-//-----------------------------------------------------------------------------
-
-extern void wxapp_install_idle_handler();
-extern bool g_isIdle;
-
-//-----------------------------------------------------------------------------
-// Convenience class for g_freeing a gchar* on scope exit automatically
-//-----------------------------------------------------------------------------
-
-class wxGtkString
-{
-public:
- explicit wxGtkString(gchar *s) : m_str(s) { }
- ~wxGtkString() { g_free(m_str); }
-
- const gchar *c_str() const { return m_str; }
-
- operator gchar *() const { return m_str; }
-
-private:
- gchar *m_str;
-
- 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
-//-----------------------------------------------------------------------------
-
-// Needed for implementing e.g. combobox on wxGTK within a modal dialog.
-void wxAddGrab(wxWindow* window);
-void wxRemoveGrab(wxWindow* window);
-
-// Escapes string so that it is valid Pango markup XML string:
-WXDLLIMPEXP_CORE wxString wxEscapeStringForPangoMarkup(const wxString& str);
-
-// The declaration for gtk_icon_size_lookup was accidentally ifdefed out in
-// GTK+ 2.1.0 which Sun seem to have shipped with some versions of JDS
-// for Solaris 9 x86.
-#ifdef NEED_GTK_ICON_SIZE_LOOKUP
-extern "C" gboolean gtk_icon_size_lookup (GtkIconSize size,
- gint *width,
- gint *height);
-#endif
+} // extern "C"
#endif // _WX_GTK_PRIVATE_H_
projects / wxWidgets.git / blobdiff