#include <gtk/gtk.h>
#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.
// 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);
}
#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
// ----------------------------------------------------------------------------
// shutdown
GtkWidget *GetButtonWidget();
GtkWidget *GetCheckButtonWidget();
+GtkWidget *GetComboBoxWidget();
GtkWidget *GetEntryWidget();
+GtkWidget *GetHeaderButtonWidgetFirst();
+GtkWidget *GetHeaderButtonWidgetLast();
GtkWidget *GetHeaderButtonWidget();
+GtkWidget *GetRadioButtonWidget();
GtkWidget *GetSplitterWidget();
+GtkWidget *GetTextEntryWidget();
GtkWidget *GetTreeWidget();
} // wxGTKPrivate