X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5edef14ec87e7fe2e1c48ed5f1a466ba60ece81a..eba99da4c0563e6508761272a1e1f1b791d0af6b:/include/wx/gtk/control.h?ds=sidebyside

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index 553f94f7c1..bcac0a83d8 100644
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/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,15 +59,10 @@ 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:
-    virtual void ApplyWidgetStyle(bool forceStyle = false);
-    // helper function to ease native widgets wrapping, called by 
-    // ApplyWidgetStyle -- override this, not ApplyWidgetStyle
-    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
-
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
 
@@ -74,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);