X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f4b1f999123ed21324bbba981a4f844442d63b72..153530afb595110592776c461e52be99b1559439:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 5ae45bd0c9..3ac71b7f5c 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -15,6 +15,7 @@ #include #include "wx/gtk/private/string.h" +#include "wx/gtk/private/gtk2-compat.h" // pango_version_check symbol is quite recent ATM (4/2007)... so we // use our own wrapper which implements a smart trick. @@ -51,13 +52,13 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); // 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() + return wxConvertToGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } inline wxCharBuffer wxConvertFromGTK(const wxString& s, const wxFont& font) { - return wxConvertFromGTK(s, font.Ok() ? font.GetEncoding() + return wxConvertFromGTK(s, font.IsOk() ? font.GetEncoding() : wxFONTENCODING_SYSTEM); } @@ -86,25 +87,6 @@ extern const gchar *wx_pango_version_check(int major, int minor, int micro); #define wxGTK_CONV_BACK_SYS(s) wxConvertFromGTK((s)) #endif -// Some deprecated GTK+ prototypes we still use often -// FIXME: Don't use them if possible. -extern "C" { - -// 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); - -} // extern "C" - - // ---------------------------------------------------------------------------- // various private helper functions // ---------------------------------------------------------------------------- @@ -122,6 +104,7 @@ GtkWidget *GetCheckButtonWidget(); GtkWidget *GetComboBoxWidget(); GtkWidget *GetEntryWidget(); GtkWidget *GetHeaderButtonWidgetFirst(); +GtkWidget *GetHeaderButtonWidgetLast(); GtkWidget *GetHeaderButtonWidget(); GtkWidget *GetRadioButtonWidget(); GtkWidget *GetSplitterWidget();