oops, reverted clntdata.h change, it _is_ needed

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index c7954c415e2b2c3b2a9adbdd2c20b5ac207f93a7..0dd1153df7393b1631845e2441a019d4badfe94e 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -56,14 +56,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;


@@ -94,7 +88,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)