wxWindow split (MSW part of changes)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2384 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -19,6 +19,7 @@
|
||||
#include "wx/window.h"
|
||||
#include "wx/toolbar.h"
|
||||
#include "wx/msw/accel.h"
|
||||
#include "wx/icon.h"
|
||||
|
||||
WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr;
|
||||
WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
|
||||
@@ -56,15 +57,6 @@ public:
|
||||
|
||||
virtual bool Destroy();
|
||||
|
||||
void GetClientSize(int *width, int *height) const;
|
||||
void GetSize(int *width, int *height) const ;
|
||||
void GetPosition(int *x, int *y) const ;
|
||||
|
||||
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;
|
||||
|
||||
@@ -182,6 +174,10 @@ public:
|
||||
#endif // tooltips
|
||||
|
||||
protected:
|
||||
void DoGetClientSize(int *width, int *height) const;
|
||||
void DoGetSize(int *width, int *height) const ;
|
||||
void DoGetPosition(int *x, int *y) const ;
|
||||
|
||||
// propagate our state change to all child frames
|
||||
void IconizeChildFrames(bool bIconize);
|
||||
|
||||
|
Reference in New Issue
Block a user