X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..222702b112dcc7bebe018d6f4d66fe469fefd02c:/include/wx/gtk1/control.h diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index be6f36bc1c..bcac0a83d8 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -29,6 +29,13 @@ class wxControl; // wxControl //----------------------------------------------------------------------------- +// C-linkage function pointer types for GetDefaultAttributesFromGTKWidget +extern "C" { + typedef GtkWidget* (*wxGtkWidgetNew_t)(void); + typedef GtkWidget* (*wxGtkWidgetNewFromStr_t)(const gchar*); + typedef GtkWidget* (*wxGtkWidgetNewFromAdj_t)(GtkAdjustment*); +} + class wxControl : public wxControlBase { public: @@ -52,7 +59,7 @@ public: // char (the one immediately after '&') into m_chAccel (TODO not yet) virtual void SetLabel( const wxString &label ); virtual wxString GetLabel() const; - + virtual wxVisualAttributes GetDefaultAttributes() const; protected: @@ -69,16 +76,16 @@ protected: bool useBase = false, int state = -1); static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void), + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t, bool useBase = false, int state = -1); static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(const gchar*), + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromStr_t, bool useBase = false, int state = -1); static wxVisualAttributes - GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*), + GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t, bool useBase = false, int state = -1);