Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...

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

diff --git a/src/mac/carbon/mdi.cpp b/src/mac/carbon/mdi.cpp
index 4869697cd7ced1494032a5bafa462c6fdc8fd0ba..887f726504c62372d91931ae79baa126d0e637ad 100644 (file)
--- a/src/mac/carbon/mdi.cpp
+++ b/src/mac/carbon/mdi.cpp
@@ -63,7 +63,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     else
         m_windowId = (int)NewControlId();
 
     else
         m_windowId = (int)NewControlId();
 

-    // TODO: create MDI parent frame
+       // this window does not exist really

 
     wxModelessWindows.Append(this);
 
 
     wxModelessWindows.Append(this);
 


@@ -75,24 +75,14 @@ wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.
 }
 
 // Get size *available for subwindows* i.e. excluding menu bar.

-void wxMDIParentFrame::GetClientSize(int *x, int *y) const
+void wxMDIParentFrame::DoGetClientSize(int *x, int *y) const

 {
 {

-    // TODO
+       wxDisplaySize( x , y ) ;

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

-    // TODO
-    if (!menu_bar)
-    {
-        m_frameMenuBar = NULL;
-        return;
-    }
-  
-    if (menu_bar->m_menuBarFrame)
-           return;
-
-    m_frameMenuBar = menu_bar;
+       wxFrame::SetMenuBar( menu_bar ) ;

 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 }
 
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)


@@ -187,7 +177,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
     if (parent) parent->AddChild(this);
 
 
     if (parent) parent->AddChild(this);
 

-    // TODO: create child frame
+       MacCreateRealWindow( title, pos , size , MacRemoveBordersFromStyle(style) , name ) ;
+  
+       m_macWindowData->m_macWindowBackgroundTheme = kThemeBrushDocumentWindowBackground ;

 
     wxModelessWindows.Append(this);
     return FALSE;
 
     wxModelessWindows.Append(this);
     return FALSE;


@@ -211,16 +203,7 @@ void wxMDIChildFrame::GetPosition(int *x, int *y) const
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 {
 
 void wxMDIChildFrame::SetMenuBar(wxMenuBar *menu_bar)
 {

-    // TODO
-    if (!menu_bar)
-    {
-        m_frameMenuBar = NULL;
-        return;
-    }
-  
-    if (menu_bar->m_menuBarFrame)
-           return;
-    m_frameMenuBar = menu_bar;
+       return wxFrame::SetMenuBar( menu_bar ) ;

 }
 
 // MDI operations
 }
 
 // MDI operations


@@ -260,6 +243,5 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 // Explicitly call default scroll behaviour
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {
 // Explicitly call default scroll behaviour
 void wxMDIClientWindow::OnScroll(wxScrollEvent& event)
 {

-    Default(); // Default processing

 }
 
 }