reverted m_adjustMinSize change prepatory for a new approach to fix

the problem


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/control.h

@@ -32,11 +32,10 @@ WXDLLEXPORT_DATA(extern const wxChar*) wxControlNameStr;
 // wxControl is the base class for all controls
 // ----------------------------------------------------------------------------
 
-
 class WXDLLEXPORT wxControlBase : public wxWindow
 {
 public:
-    wxControlBase() { Init(); }
+    wxControlBase() { }
 
     virtual ~wxControlBase();
 
@@ -64,16 +63,7 @@ public:
     // if the button was clicked)
     virtual void Command(wxCommandEvent &event);
 
-        
-    virtual void SetLabel(const wxString& label);
-    virtual bool SetFont(const wxFont& font);
-    virtual bool GetAdjustMinSizeFlag() const { return m_adjustMinSize; }
-    void SetAdjustMinSizeFlag(bool adjust) { m_adjustMinSize = adjust; }
-    
-    
 protected:
-    void Init();
-    
     // creates the control (calls wxWindowBase::CreateBase inside) and adds it
     // to the list of parents children
     bool CreateControl(wxWindowBase *parent,
@@ -98,9 +88,6 @@ protected:
         SetBestSize(size);
     }
 
-    // should minsize and size be adjusted when font or label change?
-    bool        m_adjustMinSize;  
-    
     DECLARE_NO_COPY_CLASS(wxControlBase)
 };
 

include/wx/gtk/control.h

@@ -58,7 +58,6 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
-    void PostSetLabel();
 
 #ifdef __WXGTK20__
     wxString PrepareLabelMnemonics( const wxString &label ) const;
@@ -89,7 +88,6 @@ protected:
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
-    bool       m_createComplete;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)

include/wx/gtk/stattext.h

@@ -57,8 +57,7 @@ public:
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 
-    bool GetAdjustMinSizeFlag() const { return !HasFlag(wxST_NO_AUTORESIZE); }
-    
+    bool SetFont( const wxFont &font );
     bool SetForegroundColour( const wxColour& colour );
 
     static wxVisualAttributes

include/wx/gtk1/control.h

@@ -58,7 +58,6 @@ public:
 protected:
     virtual wxSize DoGetBestSize() const;
     void PostCreation(const wxSize& size);
-    void PostSetLabel();
 
 #ifdef __WXGTK20__
     wxString PrepareLabelMnemonics( const wxString &label ) const;
@@ -89,7 +88,6 @@ protected:
 
     wxString   m_label;
     char       m_chAccel;  // enabled to avoid breaking binary compatibility later on
-    bool       m_createComplete;
 
 private:
     DECLARE_DYNAMIC_CLASS(wxControl)

include/wx/gtk1/stattext.h

@@ -57,8 +57,7 @@ public:
     wxString GetLabel() const;
     void SetLabel( const wxString &label );
 
-    bool GetAdjustMinSizeFlag() const { return !HasFlag(wxST_NO_AUTORESIZE); }
-    
+    bool SetFont( const wxFont &font );
     bool SetForegroundColour( const wxColour& colour );
 
     static wxVisualAttributes

include/wx/mac/carbon/stattext.h

@@ -40,6 +40,7 @@ public:
 
   // accessors
   void SetLabel( const wxString &str ) ;
+  bool SetFont( const wxFont &font );
 
 protected :
 

include/wx/mac/classic/stattext.h

@@ -41,6 +41,7 @@ class WXDLLEXPORT wxStaticText: public wxStaticTextBase
 
   // accessors
   void SetLabel( const wxString &str ) ;
+  bool SetFont( const wxFont &font );
 
   // operations
   virtual void Command(wxCommandEvent& WXUNUSED(event)) {};

include/wx/msw/stattext.h

@@ -40,6 +40,10 @@ public:
                 long style = 0,
                 const wxString& name = wxStaticTextNameStr);
 
+    // override some methods to resize the window properly
+    virtual void SetLabel(const wxString& label);
+    virtual bool SetFont( const wxFont &font );
+
 protected:
     // implement/override some base class virtuals
     virtual wxBorder GetDefaultBorder() const;

include/wx/stattext.h

@@ -17,8 +17,6 @@ public:
     virtual void ApplyParentThemeBackground(const wxColour& bg)
         { SetBackgroundColour(bg); }
 
-    bool GetAdjustMinSizeFlag() const { return !HasFlag(wxST_NO_AUTORESIZE); }
-    
 private:
     DECLARE_NO_COPY_CLASS(wxStaticTextBase)
 };