Some improvements to accessibility behaviour

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 7b551b6a4dc3e035264b4ab224bce4978bfe99aa..a11484a3ed944b66ae78c4f5fa4e242f6a0056a1 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        mdi.cpp
-// Purpose:     MDI classes
+// Name:        src/msw/mdi.cpp
+// Purpose:     MDI classes for wxMSW

 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98
 // Author:      Julian Smart
 // Modified by:
 // Created:     04/01/98


@@ -43,6 +43,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

+#if wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+

 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 
 #include "wx/mdi.h"
 #include "wx/msw/private.h"
 


@@ -63,9 +65,9 @@
 extern wxWindowList wxModelessWindows;      // from dialog.cpp
 extern wxMenu *wxCurrentPopupMenu;
 
 extern wxWindowList wxModelessWindows;      // from dialog.cpp
 extern wxMenu *wxCurrentPopupMenu;
 

-extern const wxChar *wxMDIFrameClassName;
+extern const wxChar *wxMDIFrameClassName;   // from app.cpp

 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassName;

-extern wxWindow *wxWndHook;                 // from window.cpp
+extern const wxChar *wxMDIChildFrameClassNameNoRedraw;

 
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 extern void wxRemoveHandleAssociation(wxWindow *win);
 
 extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 extern void wxRemoveHandleAssociation(wxWindow *win);


@@ -82,6 +84,7 @@ static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;
 static const int IDM_WINDOWICONS = 4003;
 static const int IDM_WINDOWNEXT = 4004;
 static const int IDM_WINDOWTILEVERT = 4005;

+static const int IDM_WINDOWPREV = 4006;

 
 // This range gives a maximum of 500 MDI children. Should be enough :-)
 static const int wxFIRST_MDI_CHILD = 4100;
 
 // This range gives a maximum of 500 MDI children. Should be enough :-)
 static const int wxFIRST_MDI_CHILD = 4100;


@@ -112,9 +115,17 @@ inline bool IsMdiCommandId(int id)
     return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
 }
 
     return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
 }
 

+// unpack the parameters of WM_MDIACTIVATE message

 static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
                               WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
 
 static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
                               WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact);
 

+// return the HMENU of the MDI menu
+static inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame)
+{
+    wxMenu *menu = frame->GetWindowMenu();
+    return menu ? GetHmenuOf(menu) : 0;
+}
+

 // ===========================================================================
 // implementation
 // ===========================================================================
 // ===========================================================================
 // implementation
 // ===========================================================================


@@ -150,7 +161,7 @@ wxMDIParentFrame::wxMDIParentFrame()
     m_clientWindow = NULL;
     m_currentChild = NULL;
     m_windowMenu = (wxMenu*) NULL;
     m_clientWindow = NULL;
     m_currentChild = NULL;
     m_windowMenu = (wxMenu*) NULL;

-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,
 }
 
 bool wxMDIParentFrame::Create(wxWindow *parent,


@@ -161,28 +172,29 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
                               long style,
                               const wxString& name)
 {
                               long style,
                               const wxString& name)
 {

-  m_defaultIcon = (WXHICON) (wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON : wxDEFAULT_MDIPARENTFRAME_ICON);
-

   m_clientWindow = NULL;
   m_currentChild = NULL;
 
   m_clientWindow = NULL;
   m_currentChild = NULL;
 

-  if (style & wxFRAME_NO_WINDOW_MENU)
-      m_windowMenu = (wxMenu*) NULL;
-  else
+  // this style can be used to prevent a window from having the standard MDI
+  // "Window" menu
+  if ( style & wxFRAME_NO_WINDOW_MENU )
+  {
+      m_windowMenu = (wxMenu *)NULL;
+  }
+  else // normal case: we have the window menu, so construct it

   {
   {

-  // m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));

       m_windowMenu = new wxMenu;
 
       m_windowMenu = new wxMenu;
 

-
-      m_windowMenu->Append(4002, wxT("&Cascade"));
-      m_windowMenu->Append(4001, wxT("Tile &Horizontally"));
-      m_windowMenu->Append(4005, wxT("Tile &Vertically"));
+      m_windowMenu->Append(IDM_WINDOWCASCADE, _("&Cascade"));
+      m_windowMenu->Append(IDM_WINDOWTILEHOR, _("Tile &Horizontally"));
+      m_windowMenu->Append(IDM_WINDOWTILEVERT, _("Tile &Vertically"));

       m_windowMenu->AppendSeparator();
       m_windowMenu->AppendSeparator();

-      m_windowMenu->Append(4003, wxT("&Arrange Icons"));
-      m_windowMenu->Append(4004, wxT("&Next"));
+      m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons"));
+      m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next"));
+      m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));

   }
 
   }
 

-  m_parentFrameActive = TRUE;
+  m_parentFrameActive = true;

 
   if (!parent)
     wxTopLevelWindows.Append(this);
 
   if (!parent)
     wxTopLevelWindows.Append(this);


@@ -190,62 +202,56 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   SetName(name);
   m_windowStyle = style;
 
   SetName(name);
   m_windowStyle = style;
 

-  if (parent) parent->AddChild(this);
+  if ( parent )
+      parent->AddChild(this);

 
   if ( id > -1 )
     m_windowId = id;
   else
 
   if ( id > -1 )
     m_windowId = id;
   else

-    m_windowId = (int)NewControlId();
+    m_windowId = NewControlId();

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+  WXDWORD exflags;
+  WXDWORD msflags = MSWGetCreateWindowFlags(&exflags);

 
 

-  DWORD msflags = WS_OVERLAPPED;
-  if (style & wxMINIMIZE_BOX)
-    msflags |= WS_MINIMIZEBOX;
-  if (style & wxMAXIMIZE_BOX)
-    msflags |= WS_MAXIMIZEBOX;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
-  if (style & wxSYSTEM_MENU)
-    msflags |= WS_SYSMENU;
-  if ((style & wxMINIMIZE) || (style & wxICONIZE))
-    msflags |= WS_MINIMIZE;
-  if (style & wxMAXIMIZE)
-    msflags |= WS_MAXIMIZE;
-  if (style & wxCAPTION)
-    msflags |= WS_CAPTION;
-
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
-
-  wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height,
-         msflags);
+  if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
+                            title,
+                            pos, size,
+                            msflags,
+                            exflags) )
+  {
+      return false;
+  }

 
   wxModelessWindows.Append(this);
 
   // unlike (almost?) all other windows, frames are created hidden
 
   wxModelessWindows.Append(this);
 
   // unlike (almost?) all other windows, frames are created hidden

-  m_isShown = FALSE;
+  m_isShown = false;

 
 

-  return TRUE;
+  return true;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();

+

     // already delete by DestroyChildren()
     m_frameToolBar = NULL;
     m_frameStatusBar = NULL;
 
     // already delete by DestroyChildren()
     m_frameToolBar = NULL;
     m_frameStatusBar = NULL;
 

-    // ::DestroyMenu((HMENU)m_windowMenu);

     if (m_windowMenu)
     {
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }
 
     if (m_windowMenu)
     {
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }
 

+    // the MDI frame menubar is not automatically deleted by Windows unlike for
+    // the normal frames
+    if ( m_hMenu )
+    {
+        ::DestroyMenu((HMENU)m_hMenu);
+        m_hMenu = (WXHMENU)NULL;
+    }
+

     if ( m_clientWindow )
     {
         if ( m_clientWindow->MSWGetOldWndProc() )
     if ( m_clientWindow )
     {
         if ( m_clientWindow->MSWGetOldWndProc() )


@@ -256,19 +262,17 @@ wxMDIParentFrame::~wxMDIParentFrame()
     }
 }
 
     }
 }
 

+#if wxUSE_MENUS_NATIVE
+

 void wxMDIParentFrame::InternalSetMenuBar()
 {
 void wxMDIParentFrame::InternalSetMenuBar()
 {

-//    HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
-
-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

 
 

-    HMENU subMenu = (HMENU) 0;
-    if (GetWindowMenu())
-        subMenu = (HMENU) GetWindowMenu()->GetHMenu();
-
-    InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
+    InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));

 }
 
 }
 

+#endif // wxUSE_MENUS_NATIVE
+

 void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
 {
     if (m_windowMenu)
 void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
 {
     if (m_windowMenu)


@@ -282,15 +286,19 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }

+

     if (menu)
     {
         m_windowMenu = menu;
         if (GetMenuBar())
     if (menu)
     {
         m_windowMenu = menu;
         if (GetMenuBar())

-            InsertWindowMenu(GetClientWindow(), m_hMenu, (HMENU) m_windowMenu->GetHMenu());
+        {
+            InsertWindowMenu(GetClientWindow(), m_hMenu,
+                             GetHmenuOf(m_windowMenu));
+        }

     }
 }
 
     }
 }
 

-void wxMDIParentFrame::OnSize(wxSizeEvent& event)
+void wxMDIParentFrame::OnSize(wxSizeEvent&)

 {
     if ( GetClientWindow() )
     {
 {
     if ( GetClientWindow() )
     {


@@ -324,13 +332,19 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
     if ( m_clientWindow )
     {
 {
     if ( m_clientWindow )
     {

-        m_clientWindow->SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE));
+        m_clientWindow->SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

         m_clientWindow->Refresh();
     }
 
     event.Skip();
 }
 
         m_clientWindow->Refresh();
     }
 
     event.Skip();
 }
 

+WXHICON wxMDIParentFrame::GetDefaultIcon() const
+{
+    return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON
+                                               : wxDEFAULT_MDIPARENTFRAME_ICON);
+}
+

 // ---------------------------------------------------------------------------
 // MDI operations
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // MDI operations
 // ---------------------------------------------------------------------------


@@ -370,7 +384,7 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                                      WXLPARAM lParam)
 {
     long rc = 0;
                                      WXLPARAM lParam)
 {
     long rc = 0;

-    bool processed = FALSE;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {


@@ -395,7 +409,7 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 // even if the frame didn't process it, there is no need to try it
                 // once again (i.e. call wxFrame::HandleCommand()) - we just dud it,
                 // so pretend we processed the message anyhow
                 // even if the frame didn't process it, there is no need to try it
                 // once again (i.e. call wxFrame::HandleCommand()) - we just dud it,
                 // so pretend we processed the message anyhow

-                processed = TRUE;
+                processed = true;

             }
 
             // always pass this message DefFrameProc(), otherwise MDI menu
             }
 
             // always pass this message DefFrameProc(), otherwise MDI menu


@@ -413,14 +427,14 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 rc = -1;
             }
 
                 rc = -1;
             }
 

-            processed = TRUE;
+            processed = true;

             break;
 
         case WM_ERASEBKGND:
             break;
 
         case WM_ERASEBKGND:

-            processed = TRUE;
+            processed = true;

 
             // we erase background ourselves
 
             // we erase background ourselves

-            rc = TRUE;
+            rc = true;

             break;
 
         case WM_MENUSELECT:
             break;
 
         case WM_MENUSELECT:


@@ -456,12 +470,12 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
 
 bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate)
 {
 
 bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate)
 {

-    bool processed = FALSE;
+    bool processed = false;

 
     if ( wxWindow::HandleActivate(state, minimized, activate) )
     {
         // already processed
 
     if ( wxWindow::HandleActivate(state, minimized, activate) )
     {
         // already processed

-        processed = TRUE;
+        processed = true;

     }
 
     // If this window is an MDI parent, we must also send an OnActivate message
     }
 
     // If this window is an MDI parent, we must also send an OnActivate message


@@ -469,10 +483,10 @@ bool wxMDIParentFrame::HandleActivate(int state, bool minimized, WXHWND activate
     if ( (m_currentChild != NULL) &&
          ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) )
     {
     if ( (m_currentChild != NULL) &&
          ((state == WA_ACTIVE) || (state == WA_CLICKACTIVE)) )
     {

-        wxActivateEvent event(wxEVT_ACTIVATE, TRUE, m_currentChild->GetId());
+        wxActivateEvent event(wxEVT_ACTIVATE, true, m_currentChild->GetId());

         event.SetEventObject( m_currentChild );
         if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )
         event.SetEventObject( m_currentChild );
         if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )

-            processed = TRUE;
+            processed = true;

     }
 
     return processed;
     }
 
     return processed;


@@ -490,6 +504,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 
     // is it one of standard MDI commands?
     WXWPARAM wParam = 0;
 
     // is it one of standard MDI commands?
     WXWPARAM wParam = 0;

+    WXLPARAM lParam = 0;

     int msg;
     switch ( id )
     {
     int msg;
     switch ( id )
     {


@@ -515,6 +530,12 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 
         case IDM_WINDOWNEXT:
             msg = WM_MDINEXT;
 
         case IDM_WINDOWNEXT:
             msg = WM_MDINEXT;

+            lParam = 0;         // next child
+            break;
+
+        case IDM_WINDOWPREV:
+            msg = WM_MDINEXT;
+            lParam = 1;         // previous child

             break;
 
         default:
             break;
 
         default:


@@ -523,23 +544,23 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 
     if ( msg )
     {
 
     if ( msg )
     {

-        ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, 0);
+        ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);

 
 

-        return TRUE;
+        return true;

     }
 
     // FIXME VZ: what does this test do??
     if (id >= 0xF000)
     {
     }
 
     // FIXME VZ: what does this test do??
     if (id >= 0xF000)
     {

-        return FALSE; // Get WndProc to call default proc
+        return false; // Get WndProc to call default proc

     }
 
     if ( IsMdiCommandId(id) )
     {
     }
 
     if ( IsMdiCommandId(id) )
     {

-        wxWindowList::Node* node = GetChildren().GetFirst();
+        wxWindowList::Node *node = GetChildren().GetFirst();

         while ( node )
         {
         while ( node )
         {

-            wxWindow* child = node->GetData();
+            wxWindow *child = node->GetData();

             if ( child->GetHWND() )
             {
                 long childId = wxGetWindowId(child->GetHWND());
             if ( child->GetHWND() )
             {
                 long childId = wxGetWindowId(child->GetHWND());


@@ -548,7 +569,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,
                                    (WPARAM)child->GetHWND(), 0);
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,
                                    (WPARAM)child->GetHWND(), 0);

-                    return TRUE;
+                    return true;

                 }
             }
             node = node->GetNext();
                 }
             }
             node = node->GetNext();


@@ -569,7 +590,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
         wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
     }
 
         wxFAIL_MSG(wxT("MDI parent frame is not active, yet there is no active MDI child?"));
     }
 

-    return FALSE;
+    return false;

 }
 
 long wxMDIParentFrame::MSWDefWindowProc(WXUINT message,
 }
 
 long wxMDIParentFrame::MSWDefWindowProc(WXUINT message,


@@ -593,23 +614,23 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
     if ( m_currentChild && m_currentChild->GetHWND() &&
          m_currentChild->MSWTranslateMessage(msg) )
     {
     if ( m_currentChild && m_currentChild->GetHWND() &&
          m_currentChild->MSWTranslateMessage(msg) )
     {

-        return TRUE;
+        return true;

     }
 
     // then try out accel table (will also check the menu accels)
     if ( wxFrame::MSWTranslateMessage(msg) )
     {
     }
 
     // then try out accel table (will also check the menu accels)
     if ( wxFrame::MSWTranslateMessage(msg) )
     {

-        return TRUE;
+        return true;

     }
 
     // finally, check for MDI specific built in accel keys
     if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
     {
         if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))
     }
 
     // finally, check for MDI specific built in accel keys
     if ( pMsg->message == WM_KEYDOWN || pMsg->message == WM_SYSKEYDOWN )
     {
         if ( ::TranslateMDISysAccel(GetWinHwnd(GetClientWindow()), pMsg))

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 // ===========================================================================
 }
 
 // ===========================================================================


@@ -618,7 +639,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::Init()
 {
 
 void wxMDIChildFrame::Init()
 {

-    m_needsResize = TRUE;
+    m_needsResize = true;

 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 }
 
 bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,


@@ -629,10 +650,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              long style,
                              const wxString& name)
 {
                              long style,
                              const wxString& name)
 {

-  m_defaultIcon = (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
-                                                     : wxDEFAULT_MDICHILDFRAME_ICON);
-

   SetName(name);
   SetName(name);

+  wxWindowBase::Show(true); // MDI child frame starts off shown

 
   if ( id > -1 )
     m_windowId = id;
 
   if ( id > -1 )
     m_windowId = id;


@@ -644,8 +663,6 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
       parent->AddChild(this);
   }
 
       parent->AddChild(this);
   }
 

-  wxWndHook = this;
-

   int x = pos.x;
   int y = pos.y;
   int width = size.x;
   int x = pos.x;
   int y = pos.y;
   int width = size.x;


@@ -653,7 +670,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   MDICREATESTRUCT mcs;
 
 
   MDICREATESTRUCT mcs;
 

-  mcs.szClass = wxMDIChildFrameClassName;
+  mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE
+                    ? wxMDIChildFrameClassNameNoRedraw
+                    : wxMDIChildFrameClassName;

   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
   if (x > -1)
   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
   if (x > -1)


@@ -676,7 +695,7 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   else
       mcs.cy = CW_USEDEFAULT;
 
   else
       mcs.cy = CW_USEDEFAULT;
 

-  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN;
+  DWORD msflags = WS_OVERLAPPED | WS_CLIPCHILDREN | WS_THICKFRAME | WS_VISIBLE ;

   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   if (style & wxMAXIMIZE_BOX)
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   if (style & wxMAXIMIZE_BOX)


@@ -696,31 +715,28 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   mcs.lParam = 0;
 
 
   mcs.lParam = 0;
 

-  DWORD Return = SendMessage(GetWinHwnd(parent->GetClientWindow()),
-                             WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
+  wxWindowCreationHook hook(this);

 
 

-  //handle = (HWND)LOWORD(Return);
-  // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)
-  m_hWnd = (WXHWND)Return;
+  m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
+                                 WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);

 
 

-  wxWndHook = NULL;

   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 
   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 

-  // VZ: what's this? an act of piracy?
-  //SetWindowLong(GetHwnd(), 0, (long)this);
-

   wxModelessWindows.Append(this);
   wxModelessWindows.Append(this);

-  return TRUE;
+
+  return true;

 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     DestroyChildren();
 
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
     DestroyChildren();
 

-    // already delete by DestroyChildren()
+    // already deleted by DestroyChildren()

     m_frameToolBar = NULL;
     m_frameStatusBar = NULL;
 
     m_frameToolBar = NULL;
     m_frameStatusBar = NULL;
 

+    RemoveWindowMenu(NULL, m_hMenu);
+

     MSWDestroyWindow();
 }
 
     MSWDestroyWindow();
 }
 


@@ -758,7 +774,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 

-  MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)TRUE);
+  MoveWindow(hWnd, point.x, point.y, actual_width, actual_height, (BOOL)true);

 
   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );
 
   wxSizeEvent event(wxSize(width, height), m_windowId);
   event.SetEventObject( this );


@@ -786,14 +802,16 @@ void wxMDIChildFrame::InternalSetMenuBar()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 

-    // HMENU subMenu = GetSubMenu((HMENU)parent->GetWindowMenu(), 0);
-    HMENU subMenu = (HMENU) 0;
-    if (parent->GetWindowMenu())
-        subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
+    InsertWindowMenu(parent->GetClientWindow(),
+                     m_hMenu, GetMDIWindowMenu(parent));

 
 

-    InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu);
+    parent->m_parentFrameActive = false;
+}

 
 

-    parent->m_parentFrameActive = FALSE;
+WXHICON wxMDIChildFrame::GetDefaultIcon() const
+{
+    return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
+                                              : wxDEFAULT_MDICHILDFRAME_ICON);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -840,7 +858,7 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
                                     WXLPARAM lParam)
 {
     long rc = 0;
                                     WXLPARAM lParam)
 {
     long rc = 0;

-    bool processed = FALSE;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {


@@ -856,10 +874,8 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
             break;
 
         case WM_GETMINMAXINFO:
             break;
 
         case WM_GETMINMAXINFO:

-            // let the default window proc calculate the size of MDI children
-            // frames because it is based on the size of the MDI client window,
-            // not on the values specified in wxWindow m_min/max variables
-            return MSWDefWindowProc(message, wParam, lParam);
+            processed = HandleGetMinMaxInfo((MINMAXINFO *)lParam);
+            break;

 
         case WM_MDIACTIVATE:
             {
 
         case WM_MDIACTIVATE:
             {


@@ -914,18 +930,20 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
         wxMenu *popupMenu = wxCurrentPopupMenu;
         wxCurrentPopupMenu = NULL;
         if (popupMenu->MSWCommand(cmd, id))
         wxMenu *popupMenu = wxCurrentPopupMenu;
         wxCurrentPopupMenu = NULL;
         if (popupMenu->MSWCommand(cmd, id))

-            return TRUE;
+            return true;

     }
 
     }
 

+    bool processed;

     if (GetMenuBar() && GetMenuBar()->FindItem(id))
     {
     if (GetMenuBar() && GetMenuBar()->FindItem(id))
     {

-        ProcessCommand(id);
-        return TRUE;
+        processed = ProcessCommand(id);

     }
     else
     }
     else

-        return FALSE;
+    {
+        processed = false;
+    }

 
 

-    return TRUE;
+    return processed;

 }
 
 bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 }
 
 bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),


@@ -940,13 +958,13 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
     if ( m_hWnd == hwndAct )
     {
 
     if ( m_hWnd == hwndAct )
     {

-        activated = TRUE;
+        activated = true;

         parent->m_currentChild = this;
 
         HMENU child_menu = (HMENU)GetWinMenu();
         if ( child_menu )
         {
         parent->m_currentChild = this;
 
         HMENU child_menu = (HMENU)GetWinMenu();
         if ( child_menu )
         {

-            parent->m_parentFrameActive = FALSE;
+            parent->m_parentFrameActive = false;

 
             menuToSet = child_menu;
         }
 
             menuToSet = child_menu;
         }


@@ -956,13 +974,16 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
         wxASSERT_MSG( parent->m_currentChild == this,
                       wxT("can't deactivate MDI child which wasn't active!") );
 
         wxASSERT_MSG( parent->m_currentChild == this,
                       wxT("can't deactivate MDI child which wasn't active!") );
 

-        activated = FALSE;
+        activated = false;

         parent->m_currentChild = NULL;
 
         HMENU parent_menu = (HMENU)parent->GetWinMenu();
         parent->m_currentChild = NULL;
 
         HMENU parent_menu = (HMENU)parent->GetWinMenu();

-        if ( parent_menu )
+
+        // activate the the parent menu only when there is no other child
+        // that has been activated
+        if ( parent_menu && !hwndAct )

         {
         {

-            parent->m_parentFrameActive = TRUE;
+            parent->m_parentFrameActive = true;

 
             menuToSet = parent_menu;
         }
 
             menuToSet = parent_menu;
         }


@@ -970,21 +991,20 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
     else
     {
         // we have nothing to do with it
     else
     {
         // we have nothing to do with it

-        return FALSE;
+        return false;

     }
 
     if ( menuToSet )
     {
     }
 
     if ( menuToSet )
     {

-        HMENU subMenu = (HMENU) 0;
-        if (parent->GetWindowMenu())
-            subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
-
-        MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu);
+        MDISetMenu(parent->GetClientWindow(),
+                   menuToSet, GetMDIWindowMenu(parent));

     }
 
     wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);
     event.SetEventObject( this );
 
     }
 
     wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);
     event.SetEventObject( this );
 

+    ResetWindowStyle((void *)NULL);
+

     return GetEventHandler()->ProcessEvent(event);
 }
 
     return GetEventHandler()->ProcessEvent(event);
 }
 


@@ -999,7 +1019,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
         DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
         if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
         {
         DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
         if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
         {

-            ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle);
+            ::AdjustWindowRectEx(&rectClient, dwStyle, false, dwExStyle);

             lpPos->x = rectClient.left;
             lpPos->y = rectClient.top;
             lpPos->cx = rectClient.right - rectClient.left;
             lpPos->x = rectClient.left;
             lpPos->y = rectClient.top;
             lpPos->cx = rectClient.right - rectClient.left;


@@ -1013,7 +1033,37 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
     }
 #endif // Win95
 
     }
 #endif // Win95
 

-    return FALSE;
+    return false;
+}
+
+bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
+{
+    MINMAXINFO *info = (MINMAXINFO *)mmInfo;
+
+    // let the default window proc calculate the size of MDI children
+    // frames because it is based on the size of the MDI client window,
+    // not on the values specified in wxWindow m_max variables
+    bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
+
+    int minWidth = GetMinWidth(),
+        minHeight = GetMinHeight();
+
+    // but allow GetSizeHints() to set the min size
+    if ( minWidth != -1 )
+    {
+        info->ptMinTrackSize.x = minWidth;
+
+        processed = true;
+    }
+
+    if ( minHeight != -1 )
+    {
+        info->ptMinTrackSize.y = minHeight;
+
+        processed = true;
+    }
+
+    return true;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1028,7 +1078,7 @@ long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM l
 
 bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 {
 
 bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 {

-    return m_acceleratorTable.Translate(GetParent(), msg);
+    return wxFrame::MSWTranslateMessage(msg);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -1037,7 +1087,6 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {

-    MSWDetachWindowMenu();

     invalidHandle = GetHwnd();
 
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     invalidHandle = GetHwnd();
 
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();


@@ -1074,32 +1123,38 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     if (!pChild || (pChild == this))
     {
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     if (!pChild || (pChild == this))
     {

-        DWORD dwStyle = ::GetWindowLong(GetWinHwnd(pFrameWnd->GetClientWindow()), GWL_EXSTYLE);
-        DWORD dwThisStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);
+        HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow());
+        DWORD dwStyle = ::GetWindowLong(hwndClient, GWL_EXSTYLE);
+
+        // we want to test whether there is a maximized child, so just set
+        // dwThisStyle to 0 if there is no child at all
+        DWORD dwThisStyle = pChild
+            ? ::GetWindowLong(GetWinHwnd(pChild), GWL_STYLE) : 0;

         DWORD dwNewStyle = dwStyle;
         DWORD dwNewStyle = dwStyle;

-        if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
+        if ( dwThisStyle & WS_MAXIMIZE )

             dwNewStyle &= ~(WS_EX_CLIENTEDGE);
         else
             dwNewStyle |= WS_EX_CLIENTEDGE;
 
         if (dwStyle != dwNewStyle)
         {
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);
         else
             dwNewStyle |= WS_EX_CLIENTEDGE;
 
         if (dwStyle != dwNewStyle)
         {

-            HWND hwnd = GetWinHwnd(pFrameWnd->GetClientWindow());
-            ::RedrawWindow(hwnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);
-            ::SetWindowLong(hwnd, GWL_EXSTYLE, dwNewStyle);
-            ::SetWindowPos(hwnd, NULL, 0, 0, 0, 0,
+            // force update of everything
+            ::RedrawWindow(hwndClient, NULL, NULL,
+                           RDW_INVALIDATE | RDW_ALLCHILDREN);
+            ::SetWindowLong(hwndClient, GWL_EXSTYLE, dwNewStyle);
+            ::SetWindowPos(hwndClient, NULL, 0, 0, 0, 0,

                            SWP_FRAMECHANGED | SWP_NOACTIVATE |
                            SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
                            SWP_NOCOPYBITS);
             if (rect)
                            SWP_FRAMECHANGED | SWP_NOACTIVATE |
                            SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER |
                            SWP_NOCOPYBITS);
             if (rect)

-                ::GetClientRect(hwnd, rect);
+                ::GetClientRect(hwndClient, rect);

 
 

-            return TRUE;
+            return true;

         }
     }
 #endif // Win95
 
         }
     }
 #endif // Win95
 

-    return FALSE;
+    return false;

 }
 
 // ===========================================================================
 }
 
 // ===========================================================================


@@ -1109,18 +1164,18 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {
 
 bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
 {

-    m_backgroundColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_APPWORKSPACE);
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE);

 
     CLIENTCREATESTRUCT ccs;
     m_windowStyle = style;
     m_parent = parent;
 
 
     CLIENTCREATESTRUCT ccs;
     m_windowStyle = style;
     m_parent = parent;
 

-    ccs.hWindowMenu = (HMENU) 0;
-    if (parent->GetWindowMenu())
-        ccs.hWindowMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();
+    ccs.hWindowMenu = GetMDIWindowMenu(parent);

     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 

-    DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;
+    DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD |
+                    WS_CLIPCHILDREN | WS_CLIPSIBLINGS;
+

     if ( style & wxHSCROLL )
         msStyle |= WS_HSCROLL;
     if ( style & wxVSCROLL )
     if ( style & wxHSCROLL )
         msStyle |= WS_HSCROLL;
     if ( style & wxVSCROLL )


@@ -1132,7 +1187,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     DWORD exStyle = 0;
 #endif
 
     DWORD exStyle = 0;
 #endif
 

-    wxWndHook = this;
+    wxWindowCreationHook hook(this);

     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,


@@ -1148,13 +1203,12 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     {
         wxLogLastError(wxT("CreateWindowEx(MDI client)"));
 
     {
         wxLogLastError(wxT("CreateWindowEx(MDI client)"));
 

-        return FALSE;
+        return false;

     }
 
     SubclassWin(m_hWnd);
     }
 
     SubclassWin(m_hWnd);

-    wxWndHook = NULL;

 
 

-    return TRUE;
+    return true;

 }
 
 // Explicitly call default scroll behaviour
 }
 
 // Explicitly call default scroll behaviour


@@ -1191,16 +1245,20 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
     {
         if (GetParent())
         {
     {
         if (GetParent())
         {

-            wxNode* node = GetParent()->GetChildren().First();
+            wxWindowList::Node *node = GetParent()->GetChildren().GetFirst();

             while (node)
             {
             while (node)
             {

-                wxWindow* child = (wxWindow*) node->Data();
+                wxWindow *child = node->GetData();

                 if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
                 {
                 if (child->IsKindOf(CLASSINFO(wxMDIChildFrame)))
                 {

-                    HWND hWnd = (HWND) child->GetHWND();
-                   ::RedrawWindow(hWnd, NULL, NULL, RDW_FRAME|RDW_ALLCHILDREN|RDW_INVALIDATE );
+                   ::RedrawWindow(GetHwndOf(child),
+                                  NULL,
+                                  NULL,
+                                  RDW_FRAME |
+                                  RDW_ALLCHILDREN |
+                                  RDW_INVALIDATE);

                 }
                 }

-                node = node->Next();
+                node = node->GetNext();

             }
         }
     }
             }
         }
     }


@@ -1214,7 +1272,7 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
     // generate an artificial size event here
     if ( m_needsResize )
     {
     // generate an artificial size event here
     if ( m_needsResize )
     {

-        m_needsResize = FALSE; // avoid any possibility of recursion
+        m_needsResize = false; // avoid any possibility of recursion

 
         SendSizeEvent();
     }
 
         SendSizeEvent();
     }


@@ -1240,6 +1298,10 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 

+#ifndef __WIN16__
+    ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L);
+#endif
+

     ::DrawMenuBar(GetWinHwnd(parent));
 }
 
     ::DrawMenuBar(GetWinHwnd(parent));
 }
 


@@ -1250,71 +1312,84 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
 
     if (subMenu)
     {
 
     if (subMenu)
     {

-    int N = GetMenuItemCount(hmenu);
-    bool success = FALSE;
-    for ( int i = 0; i < N; i++ )
-    {
-        wxChar buf[256];
-        int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
-        if ( chars == 0 )
+        int N = GetMenuItemCount(hmenu);
+        bool success = false;
+        for ( int i = 0; i < N; i++ )

         {
         {

-            wxLogLastError(wxT("GetMenuString"));
+            wxChar buf[256];
+            int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
+            if ( chars == 0 )
+            {
+                wxLogLastError(wxT("GetMenuString"));
+
+                continue;
+            }

 
 

-            continue;
+            if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
+            {
+                success = true;
+                ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
+                             (UINT)subMenu, _("&Window"));
+                break;
+            }

         }
 
         }
 

-        if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
+        if ( !success )

         {
         {

-            success = TRUE;
-            ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
-                         (UINT)subMenu, _("&Window"));
-            break;
+            ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));

         }
     }
 
         }
     }
 

-    if ( !success )
-    {
-        ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));
-    }
-    }
-

     MDISetMenu(win, hmenu, subMenu);
 }
 
 static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
 {
     MDISetMenu(win, hmenu, subMenu);
 }
 
 static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
 {

-    // Try to insert Window menu in front of Help, otherwise append it.
-    HMENU hmenu = (HMENU)menu;
-    int N = GetMenuItemCount(hmenu);
-    bool success = FALSE;
-    for ( int i = 0; i < N; i++ )
+    HMENU hMenu = (HMENU)menu;
+
+    if ( hMenu )

     {
     {

-        wxChar buf[256];
-        int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
-        if ( chars == 0 )
+        wxChar buf[1024];
+
+        int N = ::GetMenuItemCount(hMenu);
+        for ( int i = 0; i < N; i++ )

         {
         {

-            wxLogLastError(wxT("GetMenuString"));
+            if ( !::GetMenuString(hMenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION) )
+            {
+                // Ignore successful read of menu string with length 0 which
+                // occurs, for example, for a maximized MDI childs system menu
+                if ( ::GetLastError() != 0 )
+                {
+                    wxLogLastError(wxT("GetMenuString"));
+                }

 
 

-            continue;
-        }
+                continue;
+            }

 
 

-        if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Window")) )
-        {
-            success = TRUE;
-            ::RemoveMenu(hmenu, i, MF_BYPOSITION);
-            break;
+            if ( wxStrcmp(buf, _("&Window")) == 0 )
+            {
+                if ( !::RemoveMenu(hMenu, i, MF_BYPOSITION) )
+                {
+                    wxLogLastError(wxT("RemoveMenu"));
+                }
+
+                break;
+            }

         }
     }
 
         }
     }
 

-    // Does passing 0 for the window menu really work with WM_MDISETMENU?
-    MDISetMenu(win, hmenu, 0);
+    if ( win )
+    {
+        // we don't change the windows menu, but we update the main one
+        MDISetMenu(win, hMenu, NULL);
+    }

 }
 
 static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
                               WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
 {
 #ifdef __WIN32__
 }
 
 static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
                               WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
 {
 #ifdef __WIN32__

-    *activate = TRUE;
+    *activate = true;

     *hwndAct = (WXHWND)lParam;
     *hwndDeact = (WXHWND)wParam;
 #else // Win16
     *hwndAct = (WXHWND)lParam;
     *hwndDeact = (WXHWND)wParam;
 #else // Win16


@@ -1323,3 +1398,7 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
     *hwndDeact = (WXHWND)HIWORD(lParam);
 #endif // Win32/Win16
 }
     *hwndDeact = (WXHWND)HIWORD(lParam);
 #endif // Win32/Win16
 }

+
+#endif
+// wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+