Make wxMDIParentFrame a regular top level window

[wxWidgets.git] / src / mac / carbon / mdi.cpp

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 1d9e43f170c86a14636671a306d98c522ddd3356..de481635e2df3d9c2b485e6e82446a6ea013af83 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -27,7 +27,6 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)

-  EVT_SIZE(wxMDIParentFrame::OnSize)

   EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
   EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
   EVT_ACTIVATE(wxMDIParentFrame::OnActivate)
   EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()


@@ -123,32 +122,11 @@ wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 
 }
 
 

-// Get size *available for subwindows* i.e. excluding menu bar.
-void wxMDIParentFrame::DoGetClientSize(int *x, int *y) const
-{
-    wxDisplaySize( x , y ) ;
-}
-

 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     wxFrame::SetMenuBar( menu_bar ) ;
 }
 
 void wxMDIParentFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
     wxFrame::SetMenuBar( menu_bar ) ;
 }
 

-void wxMDIParentFrame::OnSize(wxSizeEvent& event)
-{
-#if wxUSE_CONSTRAINTS
-    if (GetAutoLayout())
-        Layout();
-#endif
-    int x = 0;
-    int y = 0;
-    int width, height;
-    GetClientSize(&width, &height);
-    
-    if ( GetClientWindow() )
-        GetClientWindow()->SetSize(x, y, width, height);
-}
-

 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {
     if ( m_currentChild && event.GetActive() )
 void wxMDIParentFrame::OnActivate(wxActivateEvent& event)
 {
     if ( m_currentChild && event.GetActive() )


@@ -308,6 +286,12 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     return TRUE;
 }
 
     return TRUE;
 }
 

+// Get size *available for subwindows* i.e. excluding menu bar.
+void wxMDIClientWindow::DoGetClientSize(int *x, int *y) const
+{
+    wxDisplaySize( x , y ) ;
+}
+

 // Explicitly call default scroll behaviour
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 // Explicitly call default scroll behaviour
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {