better native types for carbon

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

diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp
index 3367c1bc8ba1482cd5a07af96d511c84b1531f3c..eb86566919eb47bcb1dc122ec68b9e2b71c42a8e 100644 (file)
--- a/src/osx/carbon/mdi.cpp
+++ b/src/osx/carbon/mdi.cpp
@@ -71,6 +71,8 @@ void UMAHighlightAndActivateWindow( WindowRef inWindowRef , bool inActivate )
 #endif
     }
 #elif defined(wxOSX_USE_COCOA)
 #endif
     }
 #elif defined(wxOSX_USE_COCOA)

+    wxUnusedVar(inActivate);
+    wxUnusedVar(inWindowRef);

 // TODO: implement me!
 #endif
 }
 // TODO: implement me!
 #endif
 }


@@ -118,8 +120,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     m_parentFrameActive = true;
 
     m_clientWindow = OnCreateClient();
     m_parentFrameActive = true;
 
     m_clientWindow = OnCreateClient();

+    if ( !m_clientWindow || !m_clientWindow->CreateClient(this, style) )
+        return false;

 
 

-    return m_clientWindow != NULL;
+    return true;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()