don't create m_dottedPen with an invalid 0 style which results in an assert under MSW

[wxWidgets.git] / src / aui / tabmdi.cpp

diff --git a/src/aui/tabmdi.cpp b/src/aui/tabmdi.cpp
index b6d33ca85b1e7f0580e55281b8332a65c8d47c34..ccf9e885f51d37b9f06b80ef977b4d3af9a695a1 100644 (file)
--- a/src/aui/tabmdi.cpp
+++ b/src/aui/tabmdi.cpp
@@ -177,12 +177,15 @@ void wxAuiMDIParentFrame::SetChildMenuBar(wxAuiMDIChildFrame* pChild)
     if (!pChild)
     {
         // No Child, set Our menu bar back.
     if (!pChild)
     {
         // No Child, set Our menu bar back.

-        SetMenuBar(m_pMyMenuBar);
+        if (m_pMyMenuBar)
+            SetMenuBar(m_pMyMenuBar);
+        else
+            SetMenuBar(GetMenuBar());

 
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = NULL;
     }
 
         // Make sure we know our menu bar is in use
         m_pMyMenuBar = NULL;
     }

-     else
+    else

     {
         if (pChild->GetMenuBar() == NULL)
             return;
     {
         if (pChild->GetMenuBar() == NULL)
             return;


@@ -311,7 +314,7 @@ void wxAuiMDIParentFrame::AddWindowMenu(wxMenuBar *pMenuBar)
         int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));
         int pos = pMenuBar->FindMenu(wxGetStockLabel(wxID_HELP,wxSTOCK_NOFLAGS));
         if (pos == wxNOT_FOUND)
             pMenuBar->Append(m_pWindowMenu, _("&Window"));

-             else
+        else

             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }
             pMenuBar->Insert(pos, m_pWindowMenu, _("&Window"));
     }
 }


@@ -363,7 +366,7 @@ void wxAuiMDIParentFrame::Tile(wxOrientation orient)
     {
         client_window->Split(cur_idx, wxLEFT);
     }
     {
         client_window->Split(cur_idx, wxLEFT);
     }

-     else if (orient == wxHORIZONTAL)
+    else if (orient == wxHORIZONTAL)

     {
         client_window->Split(cur_idx, wxTOP);
     }
     {
         client_window->Split(cur_idx, wxTOP);
     }


@@ -443,10 +446,10 @@ bool wxAuiMDIChildFrame::Create(wxAuiMDIParentFrame* parent,
 
     // create the window off-screen to prevent flicker
     wxPanel::Create(pClientWindow,
 
     // create the window off-screen to prevent flicker
     wxPanel::Create(pClientWindow,

-                   id,
-                   wxPoint(cli_size.x+1, cli_size.y+1),
-                   size,
-                   wxNO_BORDER, name);
+                    id,
+                    wxPoint(cli_size.x+1, cli_size.y+1),
+                    size,
+                    wxNO_BORDER, name);

 
     DoShow(false);
 
 
     DoShow(false);