some != NULL checks

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

diff --git a/src/mac/mdi.cpp b/src/mac/mdi.cpp
index 4869697cd7ced1494032a5bafa462c6fdc8fd0ba..8672b2f8973cd7e74390e3fe7863f4a06dde6737 100644 (file)
--- a/src/mac/mdi.cpp
+++ b/src/mac/mdi.cpp
@@ -19,7 +19,6 @@
 
 extern wxList wxModelessWindows;
 
 
 extern wxList wxModelessWindows;
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
 IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)


@@ -34,7 +33,6 @@ BEGIN_EVENT_TABLE(wxMDIClientWindow, wxWindow)
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 
   EVT_SCROLL(wxMDIClientWindow::OnScroll)
 END_EVENT_TABLE()
 

-#endif

 
 // Parent frame
 
 
 // Parent frame
 


@@ -75,24 +73,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
+   wxFrame::DoGetClientSize( 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)


@@ -211,16 +199,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 +239,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

 }
 
 }