Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetSize() and GetClientSize() changes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-02-22 11:01:13 +00:00
parent 1edddaf24c
commit bfc6fde4b1
80 changed files with 3467 additions and 3259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/layout.h
View File

@@ -232,21 +232,11 @@ public:
bool Create(wxWindow *parent, wxSizerBehaviour behav = wxSizerNone);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO)
{ wxWindow::SetSize(rect.x, rect.y, rect.width, rect.height, sizeFlags); }
virtual void SetSize(const wxSize& size)
{ wxWindow::SetSize(size.x, size.y); }
virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); }
virtual void GetSize(int *w, int *h) const;
wxSize GetSize() const { return wxWindow::GetSize(); }
virtual void GetClientSize(int *w, int *h) const { GetSize(w, h); }
wxSize GetClientSize() const { return wxWindow::GetClientSize(); }
virtual void GetPosition(int *x, int *y) const;
wxPoint GetPosition() const { return wxWindow::GetPosition(); }
void SizerSetSize(int x, int y, int w, int h) { SetSize(x, y, w, h); }
void SizerMove(int x, int y) { Move(x, y); }
@@ -263,6 +253,11 @@ public:
virtual bool LayoutPhase1(int *);
virtual bool LayoutPhase2(int *);
protected:
virtual void DoSetSize(int x, int y,
int width, int height,
int sizeFlags = wxSIZE_AUTO);
};
#define wxSIZER_ROWS TRUE
@@ -287,7 +282,6 @@ public:
bool Create(wxWindow *parent, bool rowOrCol = wxSIZER_ROWS,
int rowsOrColSize = 20, wxSizerBehaviour = wxSizerShrink);
virtual void SetSize(int x, int y, int w, int h, int flags = wxSIZE_AUTO);
virtual void SetRowOrCol(bool rc) { rowOrCol = rc; }
virtual bool GetRowOrCol() { return rowOrCol; }