X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/adfb70c30f085c7b00468982a6294842ddc9fcb0..36a96421b31530604c9dcccc0ba2a2861359f462:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 621852a75d..3ac71b7f5c 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -5,131 +5,113 @@ // 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" +#include "wx/gtk/private/gtk2-compat.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 +// 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); -#ifdef __WXGTK20__ #if wxUSE_UNICODE - #define wxGTK_CONV(s) wxConvUTF8.cWX2MB(s) - #define wxGTK_CONV_BACK(s) wxConvUTF8.cMB2WX(s) -#else - #define wxGTK_CONV(s) wxConvUTF8.cWC2MB( wxConvLocal.cWX2WC(s) ) - #define wxGTK_CONV_BACK(s) wxConvLocal.cWC2WX( (wxConvUTF8.cMB2WC( s ) ) ) -#endif + #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::FromUTF8Unchecked(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 wxGTK_CONV(s) s.c_str() - #define wxGTK_CONV_BACK(s) s -#endif - + #include "wx/font.h" -// 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 + // 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); -// 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 - -// 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 - -// _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 WXDLLIMPEXP_CORE 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 - -#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 + // 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.IsOk() ? font.GetEncoding() + : wxFONTENCODING_SYSTEM); + } -// translate a GTK+ scroll type to a wxEventType -inline wxEventType GtkScrollTypeToWx(guint scrollType) -{ - wxEventType command; - switch ( scrollType ) + inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) { - case GTK_SCROLL_STEP_BACKWARD: - command = wxEVT_SCROLL_LINEUP; - break; + return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() + : wxFONTENCODING_SYSTEM); + } - case GTK_SCROLL_STEP_FORWARD: - command = wxEVT_SCROLL_LINEDOWN; - break; + // more helpers: allow passing GTK+ strings directly + inline wxCharBuffer + wxConvertFromGTK(const wxGtkString& gs, + wxFontEncoding enc = wxFONTENCODING_SYSTEM) + { + return wxConvertFromGTK(gs.c_str(), enc); + } - case GTK_SCROLL_PAGE_BACKWARD: - command = wxEVT_SCROLL_PAGEUP; - break; + inline wxCharBuffer + wxConvertFromGTK(const wxGtkString& gs, const wxFont& font) + { + return wxConvertFromGTK(gs.c_str(), font); + } - case GTK_SCROLL_PAGE_FORWARD: - command = wxEVT_SCROLL_PAGEDOWN; - 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)) - default: - command = wxEVT_SCROLL_THUMBTRACK; - } + #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 - return command; -} +// ---------------------------------------------------------------------------- +// various private helper functions +// ---------------------------------------------------------------------------- -inline wxEventType GtkScrollWinTypeToWx(guint scrollType) +namespace wxGTKPrivate { - // GtkScrollTypeToWx() returns SCROLL_XXX, not SCROLLWIN_XXX as we need - return GtkScrollTypeToWx(scrollType) + - wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; -} + +// these functions create the GTK widgets of the specified types which can then +// used to retrieve their styles, pass them to drawing functions &c +// +// the returned widgets shouldn't be destroyed, this is done automatically on +// shutdown +GtkWidget *GetButtonWidget(); +GtkWidget *GetCheckButtonWidget(); +GtkWidget *GetComboBoxWidget(); +GtkWidget *GetEntryWidget(); +GtkWidget *GetHeaderButtonWidgetFirst(); +GtkWidget *GetHeaderButtonWidgetLast(); +GtkWidget *GetHeaderButtonWidget(); +GtkWidget *GetRadioButtonWidget(); +GtkWidget *GetSplitterWidget(); +GtkWidget *GetTextEntryWidget(); +GtkWidget *GetTreeWidget(); + +} // wxGTKPrivate #endif // _WX_GTK_PRIVATE_H_