Corrected wxScrolledWindow's OnSize behaviour.

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

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index e99831a461b6aee638a9c28fde02e12eeee61d43..40ef1321873b68c954d02db89235497efdeed1d1 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -139,15 +139,6 @@ bool wxFrameMSW::Create(wxWindow *parent,
 {
   SetName(name);
   m_windowStyle = style;
 {
   SetName(name);
   m_windowStyle = style;

-#if wxUSE_MENUS
-  m_frameMenuBar = NULL;
-#endif // wxUSE_MENUS
-#if wxUSE_TOOLBAR
-  m_frameToolBar = NULL;
-#endif // wxUSE_TOOLBAR
-#if wxUSE_STATUSBAR
-  m_frameStatusBar = NULL;
-#endif // wxUSE_STATUSBAR

 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 
 
   SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
 


@@ -165,6 +156,14 @@ bool wxFrameMSW::Create(wxWindow *parent,
 
   m_iconized = FALSE;
 
 
   m_iconized = FALSE;
 

+  // the frame must have NULL parent HWND or it would be always on top of its
+  // parent which is not what we usually want (in fact, we only want it for
+  // frames with the special wxFRAME_FLOAT_ON_PARENT style)
+  if ( !(m_windowStyle & wxFRAME_FLOAT_ON_PARENT) )
+  {
+    parent = NULL;
+  }
+

   wxTopLevelWindows.Append(this);
 
   MSWCreate(m_windowId, parent, wxFrameClassName, this, title,
   wxTopLevelWindows.Append(this);
 
   MSWCreate(m_windowId, parent, wxFrameClassName, this, title,


@@ -486,24 +485,12 @@ void wxFrameMSW::PositionStatusBar()
 }
 #endif // wxUSE_STATUSBAR
 
 }
 #endif // wxUSE_STATUSBAR
 

-void wxFrameMSW::DetachMenuBar()
-{
-#if wxUSE_MENUS
-    if ( m_frameMenuBar )
-    {
-        m_frameMenuBar->Detach();
-        m_frameMenuBar = NULL;
-    }
-#endif // wxUSE_MENUS
-}
+#if wxUSE_MENUS_NATIVE

 
 

-void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
+void wxFrameMSW::AttachMenuBar(wxMenuBar *menubar)

 {
 {

-#if wxUSE_MENUS
-    // detach the old menu bar in any case
-    DetachMenuBar();
+    wxFrameBase::AttachMenuBar(menubar);

 
 

-#if wxUSE_MENUS_NATIVE

     if ( !menubar )
     {
         // actually remove the menu from the frame
     if ( !menubar )
     {
         // actually remove the menu from the frame


@@ -517,31 +504,21 @@ void wxFrameMSW::SetMenuBar(wxMenuBar *menubar)
         {
             m_hMenu = menubar->GetHMenu();
         }
         {
             m_hMenu = menubar->GetHMenu();
         }

-        else
+        else // no HMENU yet

         {
         {

-            if (menubar->IsAttached())
-                menubar->Detach();
-

             m_hMenu = menubar->Create();
 
             if ( !m_hMenu )
             m_hMenu = menubar->Create();
 
             if ( !m_hMenu )

+            {
+                wxFAIL_MSG( _T("failed to create menu bar") );

                 return;
                 return;

+            }

         }
 
         InternalSetMenuBar();
     }
         }
 
         InternalSetMenuBar();
     }

-#endif // wxUSE_MENUS_NATIVE
-
-    if ( menubar )
-    {
-        m_frameMenuBar = menubar;
-        menubar->Attach((wxFrame *)this);
-    }
-#endif // wxUSE_MENUS

 }
 
 }
 

-#if wxUSE_MENUS_NATIVE
-

 void wxFrameMSW::InternalSetMenuBar()
 {
 #ifndef __WXMICROWIN__
 void wxFrameMSW::InternalSetMenuBar()
 {
 #ifndef __WXMICROWIN__


@@ -926,7 +903,7 @@ void wxFrameMSW::IconizeChildFrames(bool bIconize)
 
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user
 
         // the child MDI frames are a special case and should not be touched by
         // the parent frame - instead, they are managed by the user

-        wxFrameMSW *frame = wxDynamicCast(win, wxFrameMSW);
+        wxFrameMSW *frame = wxDynamicCast(win, wxFrame);

         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
                 && !wxDynamicCast(frame, wxMDIChildFrame)
         if ( frame
 #if wxUSE_MDI_ARCHITECTURE
                 && !wxDynamicCast(frame, wxMDIChildFrame)