AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't override DoGetBestSize() in wxGenericStaticText, it's unnecessary.

Browse Source 
The base class already does exactly the same thing -- except that it also
accounts for the borders properly.

Also fix access for a couple of DoXXX() member functions which should be
protected and an event handler which can be private.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-12-08 15:56:21 +00:00
parent d7d943a71c
commit f26c1c3e4a
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/generic/stattextg.h
View File

@ -44,8 +44,8 @@ public:
const wxString& name = wxStaticTextNameStr);
protected:
virtual wxSize DoGetBestClientSize() const;
virtual wxSize DoGetBestSize() const;
virtual void SetLabel(const wxString& label);
virtual bool SetFont(const wxFont &font);
@ -53,11 +53,11 @@ public:
virtual wxString DoGetLabel() const { return m_label; }
virtual void DoSetLabel(const wxString& label);
protected:
void OnPaint(wxPaintEvent& event);
void DoSetSize(int x, int y, int width, int height, int sizeFlags);
private:
void OnPaint(wxPaintEvent& event);
wxString m_label;
int m_mnemonic;

8
src/generic/stattextg.cpp
View File

@ -82,14 +82,6 @@ wxSize wxGenericStaticText::DoGetBestClientSize() const
return wxSize(width, height);
}
wxSize wxGenericStaticText::DoGetBestSize() const
{
wxSize ret = DoGetBestClientSize();
CacheBestSize(ret);
return ret;
}
void wxGenericStaticText::SetLabel(const wxString& label)
{
wxControl::SetLabel(label);