only one of SetSize()s, SetClientSize()s, GetPosition()s &c is virtual now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1191 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-12-13 22:01:50 +00:00
parent de13591805
commit 7b218dfaf4
5 changed files with 43 additions and 59 deletions

View File

@@ -231,11 +231,9 @@ class WXDLLEXPORT wxSizer: public wxWindow
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
// Avoid compiler warning
void SetSize(int w, int h) { wxWindow::SetSize(w, h); }
virtual void Move(int x, int y);
virtual void GetSize(int *w, int *h) const;
inline virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
virtual void GetPosition(int *x, int *y) const;
inline void SizerSetSize(int x, int y, int w, int h)
@@ -277,9 +275,7 @@ class WXDLLEXPORT wxRowColSizer: public wxSizer
~wxRowColSizer();
bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS, int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
// Avoid compiler warning
void SetSize(int w, int h) { wxSizer::SetSize(w, h); }
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
inline virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
inline virtual bool GetRowOrCol() { return rowOrCol; }