added xpm

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 3624c580e9a037575c2fa516ef2e7a1cbde7caed..4eaf3c777902851631519414d7c2b823f1d5677f 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -302,7 +302,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
         if (GetMenuBar())
         {
             InsertWindowMenu(GetClientWindow(), m_hMenu,
-                             GetHMenuOf(m_windowMenu));
+                             GetHmenuOf(m_windowMenu));
         }
     }
 }
@@ -695,7 +695,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   else
       mcs.cy = CW_USEDEFAULT;
 
-  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN;
+  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME;
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   if (style & wxMAXIMIZE_BOX)
@@ -726,14 +726,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   wxModelessWindows.Append(this);
 
-  // Necessary to make ResetWindowStyle() work
-  // and will be called eventually anyway 
-  Activate();
-
-  // Without this, a maximized child will still
-  // a double border around the child
-  ResetWindowStyle((void *)NULL); // Set the Client ExStyle right
-
   return TRUE;
 }
 
@@ -1011,6 +1003,8 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
     wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);
     event.SetEventObject( this );
 
+    ResetWindowStyle((void *)NULL);
+
     return GetEventHandler()->ProcessEvent(event);
 }