X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbdb39b2d0b8c3359eab1693fd1fc786499f62d7..8ffd43c56b793781fde046aa532340b92a0067eb:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index 5c27215173..a0e3ae67fc 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -56,26 +56,16 @@ public: virtual bool Destroy(); - void SetClientSize(int width, int height); - void SetClientSize(const wxSize& sz) { wxWindow::SetClientSize(sz); } - void GetClientSize(int *width, int *height) const; - wxSize GetClientSize() const { return wxWindow::GetClientSize(); } - void GetSize(int *width, int *height) const ; - wxSize GetSize() const { return wxWindow::GetSize(); } - void GetPosition(int *x, int *y) const ; - wxPoint GetPosition() const { return wxWindow::GetPosition(); } - virtual void SetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO); - virtual void SetSize(const wxRect& rect, int sizeFlags = wxSIZE_AUTO) - { wxWindow::SetSize(rect, sizeFlags); } - virtual void SetSize(const wxSize& size) { wxWindow::SetSize(size); } - virtual void SetSize(int width, int height) { SetSize(-1, -1, width, height, wxSIZE_USE_EXISTING); } + wxSize GetSize() const { return wxWindow::GetSize(); } + wxPoint GetPosition() const { return wxWindow::GetPosition(); } + wxSize GetClientSize() const { return wxWindow::GetClientSize(); } + wxRect GetClientRect() const { return wxWindow::GetClientRect(); } virtual void ClientToScreen(int *x, int *y) const; - virtual void ScreenToClient(int *x, int *y) const; void OnSize(wxSizeEvent& event); @@ -208,6 +198,11 @@ protected: WXHWND m_hwndToolTip; #endif // tooltips + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); + virtual void DoSetClientSize(int width, int height); + private: DECLARE_EVENT_TABLE() };