OS/2 fix

[wxWidgets.git] / include / wx / gtk1 / control.h

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index c7954c415e2b2c3b2a9adbdd2c20b5ac207f93a7..bcac0a83d82bd8827fa714b40cac92f6e2f1112f 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -29,6 +29,13 @@ class wxControl;
 // 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:
 class wxControl : public wxControlBase
 {
 public:


@@ -56,14 +63,8 @@ public:
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 protected:
     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);
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);

-    void PostSetLabel();

 
 #ifdef __WXGTK20__
     wxString PrepareLabelMnemonics( const wxString &label ) const;
 
 #ifdef __WXGTK20__
     wxString PrepareLabelMnemonics( const wxString &label ) const;


@@ -75,16 +76,16 @@ protected:
                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes
                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes

-        GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(void),
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNew_t,

                                           bool useBase = false,
                                           int state = -1);
     static wxVisualAttributes
                                           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
                                           bool useBase = false,
                                           int state = -1);
 
     static wxVisualAttributes

-        GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustment*),
+        GetDefaultAttributesFromGTKWidget(wxGtkWidgetNewFromAdj_t,

                                           bool useBase = false,
                                           int state = -1);
 
                                           bool useBase = false,
                                           int state = -1);
 


@@ -94,7 +95,6 @@ protected:
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on

-    bool       m_createComplete;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)