Don't set wxTextAttr font family to invalid value.

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

diff --git a/src/osx/carbon/mdi.cpp b/src/osx/carbon/mdi.cpp
index 3367c1bc8ba1482cd5a07af96d511c84b1531f3c..f236d572a429dfe6c3ed4ae24bacd730d9172aef 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)
+    wxUnusedVar(inActivate);
+    wxUnusedVar(inWindowRef);
 // TODO: implement me!
 #endif
 }
@@ -118,8 +120,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
     m_parentFrameActive = true;
 
     m_clientWindow = OnCreateClient();
+    if ( !m_clientWindow || !m_clientWindow->CreateClient(this, style) )
+        return false;
 
-    return m_clientWindow != NULL;
+    return true;
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
@@ -245,7 +249,9 @@ void wxMDIParentFrame::MacActivate(long timestamp, bool activating)
         else // schedule ourselves for deactivation
         {
             if (s_macDeactivateWindow)
+            {
                 wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
+            }
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed MDI Parent deactivation"));
 
             s_macDeactivateWindow = this;
@@ -398,7 +404,9 @@ void wxMDIChildFrame::MacActivate(long timestamp, bool activating)
         else // schedule ourselves for deactivation
         {
             if (s_macDeactivateWindow)
+            {
                 wxLogTrace(TRACE_MDI, wxT("window=%p SHOULD have been deactivated, oh well!"), s_macDeactivateWindow);
+            }
             wxLogTrace(TRACE_MDI, wxT("Scheduling delayed deactivation"));
 
             s_macDeactivateWindow = this;