X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ca5bf83bdad27a333729c1a7320da5106657efde..a516284f67e1910fc6dc5364b289340332d0d35f:/include/wx/gtk/private.h diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 286cc121a6..c1a8c66f6e 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. @@ -86,31 +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" - - -// some newer functions not available in older versions of GTK+: -#if !GTK_CHECK_VERSION(2,9,0) -#define g_object_ref_sink(x) gtk_object_sink(GTK_OBJECT(x)) -#endif - - // ---------------------------------------------------------------------------- // various private helper functions // ---------------------------------------------------------------------------- @@ -125,9 +101,14 @@ namespace wxGTKPrivate // shutdown GtkWidget *GetButtonWidget(); GtkWidget *GetCheckButtonWidget(); +GtkWidget *GetComboBoxWidget(); GtkWidget *GetEntryWidget(); +GtkWidget *GetHeaderButtonWidgetFirst(); +GtkWidget *GetHeaderButtonWidgetLast(); GtkWidget *GetHeaderButtonWidget(); +GtkWidget *GetRadioButtonWidget(); GtkWidget *GetSplitterWidget(); +GtkWidget *GetTextEntryWidget(); GtkWidget *GetTreeWidget(); } // wxGTKPrivate