X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5a49d4c5267d4eb933d45ec615ac2ed374750dc..55bfbcb92b41ab1c6a0d490f2f3fcadefc069bb7:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 93ea5878c4..d19eed94ea 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -5,17 +5,17 @@ // Modified by: // Created: 12.03.02 // RCS-ID: $Id$ -// Copyright: (c) 2002 Vadim Zeitlin -// Licence: wxWindows license +// Copyright: (c) 2002 Vadim Zeitlin +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _WX_GTK_PRIVATE_H_ #define _WX_GTK_PRIVATE_H_ -#include #include #include "wx/event.h" +#include "wx/gtk/private/string.h" // fail all version tests if the GTK+ version is so ancient that it doesn't // even have GTK_CHECK_VERSION @@ -23,113 +23,125 @@ #define GTK_CHECK_VERSION(a, b, c) 0 #endif -// GTK+ 2.0 compatibility define is broken when used from C++ as it casts enum -// to int implicitly -#ifdef __WXGTK20__ - #undef gtk_signal_disconnect_by_func - #define gtk_signal_disconnect_by_func(object,func,data) \ - gtk_signal_compat_matched((object), (func), (data), \ - (GSignalMatchType)(G_SIGNAL_MATCH_FUNC | \ - G_SIGNAL_MATCH_DATA), 0) -#endif - -// child is not a member of GTK_BUTTON() any more in GTK+ 2.0 -#ifdef __WXGTK20__ - #define BUTTON_CHILD(w) GTK_BIN((w))->child -#else - #define BUTTON_CHILD(w) GTK_BUTTON((w))->child -#endif - -// event_window has disappeared from GtkToggleButton in GTK+ 2.0 -#ifdef __WXGTK20__ - #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_BUTTON((w))->event_window -#else - #define TOGGLE_BUTTON_EVENT_WIN(w) GTK_TOGGLE_BUTTON((w))->event_window -#endif - -// get the font from a style +// 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: // -// TODO: GdkFont has been replaced by PangoFontDescription in GTK+ 2.0 -// and we really should use it instead of GdkFont (see also dclient.cpp) -#ifdef __WXGTK20__ - #define GET_STYLE_FONT(style) gtk_style_get_font(style) - #define SET_STYLE_FONT(style, font) gtk_style_set_font(style, font) +// 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)) + + #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 - #define GET_STYLE_FONT(style) ((style)->font) - #define SET_STYLE_FONT(style, fnt) \ - gdk_font_unref( style->font ); \ - style->font = gdk_font_ref( fnt ) -#endif + #include "wx/font.h" -// gtk_editable_{copy|cut|paste}_clipboard() had an extra argument under -// previous GTK+ versions but no more -#if defined(__WXGTK20__) || (GTK_MINOR_VERSION > 0) - #define DUMMY_CLIPBOARD_ARG -#else - #define DUMMY_CLIPBOARD_ARG ,0 -#endif + // convert the text between the given encoding and UTF-8 used by wxGTK + extern wxCharBuffer + wxConvertToGTK(const wxString& s, + wxFontEncoding enc = wxFONTENCODING_SYSTEM); -// _GtkEditable is now private -#ifdef __WXGTK20__ - #define GET_EDITABLE_POS(w) gtk_editable_get_position(GTK_EDITABLE(w)) - #define SET_EDITABLE_POS(w, pos) \ - gtk_editable_set_position(GTK_EDITABLE(w), (pos)) -#else - #define GET_EDITABLE_POS(w) GTK_EDITABLE((w))->current_pos - #define SET_EDITABLE_POS(w, pos) \ - GTK_EDITABLE((w))->current_pos = (pos) -#endif + extern wxCharBuffer + wxConvertFromGTK(const wxString& s, + wxFontEncoding enc = wxFONTENCODING_SYSTEM); -// this GtkNotebook struct field has been renamed -#ifdef __WXGTK20__ - #define NOTEBOOK_PANEL(nb) GTK_NOTEBOOK(nb)->event_window -#else - #define NOTEBOOK_PANEL(nb) GTK_NOTEBOOK(nb)->panel -#endif + // helper: use the encoding of the given font if it's valid + inline wxCharBuffer wxConvertToGTK(const wxString& s, const wxFont& font) + { + return wxConvertToGTK(s, font.Ok() ? font.GetEncoding() + : wxFONTENCODING_SYSTEM); + } -#ifdef __WXGTK20__ - #define SCROLLBAR_CBACK_ARG - #define GET_SCROLL_TYPE(w) GTK_SCROLL_JUMP -#else - #define SCROLLBAR_CBACK_ARG - #define GET_SCROLL_TYPE(w) GTK_RANGE((w))->scroll_type -#endif + inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) + { + return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding() + : wxFONTENCODING_SYSTEM); + } -// translate a GTK+ scroll type to a wxEventType -inline wxEventType GtkScrollTypeToWx(guint scrollType) -{ - wxEventType command; - switch ( scrollType ) + // more helpers: allow passing GTK+ strings directly + inline wxCharBuffer + wxConvertFromGTK(const wxGtkString& gs, + wxFontEncoding enc = wxFONTENCODING_SYSTEM) { - case GTK_SCROLL_STEP_BACKWARD: - command = wxEVT_SCROLL_LINEUP; - break; + return wxConvertFromGTK(gs.c_str(), enc); + } - case GTK_SCROLL_STEP_FORWARD: - command = wxEVT_SCROLL_LINEDOWN; - break; + inline wxCharBuffer + wxConvertFromGTK(const wxGtkString& gs, const wxFont& font) + { + return wxConvertFromGTK(gs.c_str(), font); + } - case GTK_SCROLL_PAGE_BACKWARD: - command = wxEVT_SCROLL_PAGEUP; - break; + #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)) - case GTK_SCROLL_PAGE_FORWARD: - command = wxEVT_SCROLL_PAGEDOWN; - break; + #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 - default: - command = wxEVT_SCROLL_THUMBTRACK; - } +// 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); + +// Deprecated since GTK+-1.3.7: +// Trivial wrapper around gtk_window_move, with some side effects we seem to rely on +void gtk_widget_set_uposition (GtkWidget *widget, + gint x, + gint y); + +// We rely on the allow_shrink parameter in one place +void gtk_window_set_policy (GtkWindow *window, + gint allow_shrink, + gint allow_grow, + gint auto_shrink); + +G_END_DECLS + +//----------------------------------------------------------------------------- +// 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 - return command; -} +#ifdef __WXGTK20__ +#include -inline wxEventType GtkScrollWinTypeToWx(guint scrollType) -{ - // GtkScrollTypeToWx() returns SCROLL_XXX, not SCROLLWIN_XXX as we need - return GtkScrollTypeToWx(scrollType) + - wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; -} +// Returns stock accelerator modifier and key code for the given ID +WXDLLEXPORT bool wxGetStockGtkAccelerator(const char *id, GdkModifierType *mod, guint *key); +#endif #endif // _WX_GTK_PRIVATE_H_