X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e6c0513862fc9a33e5800526058193b7492d8b..ad0ac642d5764497804bee2caad4fc1f20fc6cea:/include/wx/gtk/control.h diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 0dd1153df7..0bbe956798 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -23,13 +23,20 @@ // classes //----------------------------------------------------------------------------- -class wxControl; +class WXDLLIMPEXP_CORE wxControl; //----------------------------------------------------------------------------- // wxControl //----------------------------------------------------------------------------- -class wxControl : public wxControlBase +// 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 WXDLLIMPEXP_CORE wxControl : public wxControlBase { public: wxControl(); @@ -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);