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
This commit is contained in:
@@ -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)
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user