From 25b1fc055a49edefeb2441877696cbea9e472c32 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Feb 1999 12:25:55 +0000 Subject: [PATCH] SetSize() fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1786 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/motif/mdi.h | 2 +- src/motif/mdi.cpp | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/wx/motif/mdi.h b/include/wx/motif/mdi.h index 37cb782543..a977ca4e6a 100644 --- a/include/wx/motif/mdi.h +++ b/include/wx/motif/mdi.h @@ -78,7 +78,7 @@ public: wxMDIChildFrame *GetActiveChild() const ; // Get the client window - inline wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; }; + wxMDIClientWindow *GetClientWindow() const { return m_clientWindow; }; // Create the client window class (don't Create the window, // just return a new class) diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp index 929e51d3c2..29534aa7a6 100644 --- a/src/motif/mdi.cpp +++ b/src/motif/mdi.cpp @@ -44,17 +44,17 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame) IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxNotebook) BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame) -EVT_SIZE(wxMDIParentFrame::OnSize) -EVT_ACTIVATE(wxMDIParentFrame::OnActivate) -EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) + EVT_SIZE(wxMDIParentFrame::OnSize) + EVT_ACTIVATE(wxMDIParentFrame::OnActivate) + EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged) END_EVENT_TABLE() BEGIN_EVENT_TABLE(wxMDIClientWindow, wxNotebook) -EVT_SCROLL(wxMDIClientWindow::OnScroll) -EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged) + EVT_SCROLL(wxMDIClientWindow::OnScroll) + EVT_NOTEBOOK_PAGE_CHANGED(wxID_NOTEBOOK_CLIENT_AREA, wxMDIClientWindow::OnPageChanged) END_EVENT_TABLE() -#endif +#endif // USE_SHARED_LIBRARY // Parent frame @@ -131,6 +131,11 @@ void wxMDIParentFrame::OnSize(wxSizeEvent& event) GetClientWindow()->SetSize(x, y, width, height); } +void wxMDIParentFrame::GetClientSize(int *width, int *height) const +{ + return wxWindow::GetClientSize(width. height); +} + void wxMDIParentFrame::OnActivate(wxActivateEvent& event) { // Do nothing @@ -231,6 +236,18 @@ bool wxMDIParentFrame::ProcessEvent(wxEvent& event) return res; } +void wxMDIParentFrame::DoSetSize(int x, int y, + int width, int height, + int sizeFlags) +{ + return wxWindow::DoSetSize(x, y, width, height, sizeFlags); +} + +void wxMDIParentFrame::DoSetClientSize(int width, int height) +{ + return wxWindow::DoSetClientSize(width, height); +} + // Responds to colour changes, and passes event on to children. void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event) { -- 2.45.2