Eliminate a warning

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index a8c09a69523d81f53f400df6e96f00952c84a61b..d3bb9aa47db2fcce5e948724e4b069a4b91845a2 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:     wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ===========================================================================


@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "mdi.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,71 +24,54 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_MDI && !defined(__WXUNIVERSAL__)
+
+#include "wx/mdi.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/setup.h"

     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

-    #if wxUSE_STATUSBAR
-        #include "wx/statusbr.h"
-    #endif
+    #include "wx/statusbr.h"

     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/settings.h"
     #include "wx/intl.h"
     #include "wx/log.h"

+    #include "wx/toolbar.h"

 #endif
 
 #endif
 

-#include "wx/mdi.h"
+#include "wx/stockitem.h"

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

-#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
-    #include "wx/msw/statbr95.h"
-#endif
-
-#if wxUSE_TOOLBAR
-    #include "wx/toolbar.h"
-#endif // wxUSE_TOOLBAR
-

 #include <string.h>
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 
 #include <string.h>
 
 // ---------------------------------------------------------------------------
 // global variables
 // ---------------------------------------------------------------------------
 

-extern wxWindowList wxModelessWindows;      // from dialog.cpp

 extern wxMenu *wxCurrentPopupMenu;
 
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
 extern wxMenu *wxCurrentPopupMenu;
 
 extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassNameNoRedraw;

-
-extern wxWindow *wxWndHook;                 // from window.cpp
-
-extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);

 extern void wxRemoveHandleAssociation(wxWindow *win);
 
 extern void wxRemoveHandleAssociation(wxWindow *win);
 

-static HWND invalidHandle = 0;
-

 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // constants
 // ---------------------------------------------------------------------------
 

-static const int IDM_WINDOWTILE  = 4001;

 static const int IDM_WINDOWTILEHOR  = 4001;
 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_WINDOWTILEHOR  = 4001;
 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_WINDOWPREV = 4006;

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

-// Status border dimensions
-static const int wxTHICK_LINE_BORDER = 3;
-static const int wxTHICK_LINE_WIDTH  = 1;
-

 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // private functions
 // ---------------------------------------------------------------------------


@@ -103,10 +82,10 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow);
 
 // insert the window menu (subMenu) into menu just before "Help" submenu or at
 // the very end if not found
 
 // insert the window menu (subMenu) into menu just before "Help" submenu or at
 // the very end if not found

-static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);
+static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);

 
 // Remove the window menu
 
 // Remove the window menu

-static void RemoveWindowMenu(wxWindow *win, WXHMENU menu);
+static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu);

 
 // is this an id of an MDI child?
 inline bool IsMdiCommandId(int id)
 
 // is this an id of an MDI child?
 inline bool IsMdiCommandId(int id)


@@ -114,9 +93,20 @@ 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
+//
+// this function works correctly even when we don't have a window menu and just
+// returns 0 then
+static inline HMENU GetMDIWindowMenu(wxMDIParentFrame *frame)
+{
+    wxMenu *menu = frame->GetWindowMenu();
+    return menu ? GetHmenuOf(menu) : 0;
+}
+

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


@@ -131,6 +121,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)

+    EVT_ICONIZE(wxMDIParentFrame::OnIconized)

     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 
     EVT_SYS_COLOUR_CHANGED(wxMDIParentFrame::OnSysColourChanged)
 END_EVENT_TABLE()
 


@@ -151,8 +142,8 @@ wxMDIParentFrame::wxMDIParentFrame()
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;

-    m_windowMenu = (wxMenu*) NULL;
-    m_parentFrameActive = TRUE;
+    m_windowMenu = NULL;
+    m_parentFrameActive = true;

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


@@ -163,10 +154,6 @@ 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;
 


@@ -174,7 +161,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   // "Window" menu
   if ( style & wxFRAME_NO_WINDOW_MENU )
   {
   // "Window" menu
   if ( style & wxFRAME_NO_WINDOW_MENU )
   {

-      m_windowMenu = (wxMenu *)NULL;
+      m_windowMenu = NULL;

   }
   else // normal case: we have the window menu, so construct it
   {
   }
   else // normal case: we have the window menu, so construct it
   {


@@ -186,9 +173,10 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
       m_windowMenu->AppendSeparator();
       m_windowMenu->Append(IDM_WINDOWICONS, _("&Arrange Icons"));
       m_windowMenu->Append(IDM_WINDOWNEXT, _("&Next"));
       m_windowMenu->AppendSeparator();
       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);


@@ -196,69 +184,54 @@ 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 )
+  if ( id != wxID_ANY )

     m_windowId = id;
   else
     m_windowId = id;
   else

-    m_windowId = (int)NewControlId();
-
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
-
-  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;
-
-  if ( !wxWindow::MSWCreate(m_windowId,
-                            parent,
-                            wxMDIFrameClassName,
-                            this,
-                            title,
-                            x, y, width, height,
-                            msflags) )
+    m_windowId = NewControlId();
+
+  WXDWORD exflags;
+  WXDWORD msflags = MSWGetCreateWindowFlags(&exflags);
+  msflags &= ~WS_VSCROLL;
+  msflags &= ~WS_HSCROLL;
+
+  if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
+                            title.wx_str(),
+                            pos, size,
+                            msflags,
+                            exflags) )

   {
   {

-      return FALSE;
+      return false;

   }
 
   }
 

-  wxModelessWindows.Append(this);
+  SetOwnBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_APPWORKSPACE));

 
   // unlike (almost?) all other windows, frames are created hidden
 
   // unlike (almost?) all other windows, frames are created hidden

-  m_isShown = FALSE;
+  m_isShown = false;

 
 

-  return TRUE;
+  return true;

 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {
 }
 
 wxMDIParentFrame::~wxMDIParentFrame()
 {

-    DestroyChildren();
-    // already delete by DestroyChildren()
+    // see comment in ~wxMDIChildFrame
+#if wxUSE_TOOLBAR

     m_frameToolBar = NULL;
     m_frameToolBar = NULL;

+#endif
+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR

 
 

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

 
     if ( m_clientWindow )
     {
 
     if ( m_clientWindow )
     {


@@ -270,44 +243,138 @@ wxMDIParentFrame::~wxMDIParentFrame()
     }
 }
 
     }
 }
 

-void wxMDIParentFrame::InternalSetMenuBar()
+// ----------------------------------------------------------------------------
+// wxMDIParentFrame child management
+// ----------------------------------------------------------------------------
+
+int wxMDIParentFrame::GetChildFramesCount() const
+{
+    int count = 0;
+    for ( wxWindowList::const_iterator i = GetChildren().begin();
+          i != GetChildren().end();
+          ++i )
+    {
+        if ( wxDynamicCast(*i, wxMDIChildFrame) )
+            count++;
+    }
+
+    return count;
+}
+
+void wxMDIParentFrame::AddMDIChild(wxMDIChildFrame * WXUNUSED(child))
+{
+    if ( GetChildFramesCount() == 1 )
+    {
+        // first MDI child added, we need to insert the window menu now if we
+        // have it
+        AddWindowMenu();
+    }
+}
+
+void wxMDIParentFrame::RemoveMDIChild(wxMDIChildFrame * WXUNUSED(child))
+{
+    if ( GetChildFramesCount() == 1 )
+    {
+        // last MDI child is being removed, remove the now unnecessary window
+        // menu too
+        RemoveWindowMenu();
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxMDIParentFrame window menu handling
+// ----------------------------------------------------------------------------
+
+void wxMDIParentFrame::AddWindowMenu()

 {
 {

-//    HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
+    if ( m_windowMenu )
+        MDIInsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
+}

 
 

-    m_parentFrameActive = TRUE;
+void wxMDIParentFrame::RemoveWindowMenu()
+{
+    if ( m_windowMenu )
+        MDIRemoveWindowMenu(GetClientWindow(), m_hMenu);
+}
+
+#if wxUSE_MENUS_NATIVE

 
 

-    HMENU subMenu = (HMENU) 0;
-    if (GetWindowMenu())
-        subMenu = (HMENU) GetWindowMenu()->GetHMenu();
+void wxMDIParentFrame::InternalSetMenuBar()
+{
+    m_parentFrameActive = true;

 
 

-    InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
+    if ( GetActiveChild() )
+    {
+        AddWindowMenu();
+    }
+    else // we don't have any MDI children yet
+    {
+        // wait until we do to add the window menu but do set the main menu for
+        // now (this is done by AddWindowMenu() as a side effect)
+        MDISetMenu(GetClientWindow(), (HMENU)m_hMenu, NULL);
+    }

 }
 
 }
 

+#endif // wxUSE_MENUS_NATIVE
+

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

-        if (GetMenuBar())
-        {
-            // Remove old window menu
-            RemoveWindowMenu(GetClientWindow(), m_hMenu);
-        }
+        RemoveWindowMenu();

 
         delete m_windowMenu;
 
         delete m_windowMenu;

-        m_windowMenu = (wxMenu*) NULL;
+        m_windowMenu = NULL;

     }
     }

+

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

-        if (GetMenuBar())
+
+        AddWindowMenu();
+    }
+}
+
+void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
+{
+    wxMDIChildFrame *child = GetActiveChild();
+    if ( child )
+    {
+        wxEvtHandler* source = child->GetEventHandler();
+        wxMenuBar* bar = child->GetMenuBar();
+
+        if (menu)

         {
         {

-            InsertWindowMenu(GetClientWindow(), m_hMenu,
-                             GetHmenuOf(m_windowMenu));
+            menu->UpdateUI(source);
+        }
+        else
+        {
+            if ( bar != NULL )
+            {
+                int nCount = bar->GetMenuCount();
+                for (int n = 0; n < nCount; n++)
+                    bar->GetMenu(n)->UpdateUI(source);
+            }

         }
     }
         }
     }

+    else
+    {
+        wxFrameBase::DoMenuUpdates(menu);
+    }
+}
+
+const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
+{
+    const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
+    if ( !item && m_currentChild )
+    {
+        item = m_currentChild->FindItemInMenuBar(menuId);
+    }
+
+    return item;

 }
 
 }
 

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

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


@@ -318,6 +385,21 @@ void wxMDIParentFrame::OnSize(wxSizeEvent&)
     }
 }
 
     }
 }
 

+void wxMDIParentFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+{
+    UpdateClientSize();
+
+    // do not call event.Skip() here, it somehow messes up MDI client window
+}
+
+void wxMDIParentFrame::OnIconized(wxIconizeEvent& event)
+{
+    event.Skip();
+
+    if ( !event.IsIconized() )
+        UpdateClientSize();
+}
+

 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {
 // Returns the active MDI child window
 wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
 {


@@ -325,8 +407,8 @@ wxMDIChildFrame *wxMDIParentFrame::GetActiveChild() const
                                     WM_MDIGETACTIVE, 0, 0L);
     if ( hWnd == 0 )
         return NULL;
                                     WM_MDIGETACTIVE, 0, 0L);
     if ( hWnd == 0 )
         return NULL;

-    else
-        return (wxMDIChildFrame *)wxFindWinFromHandle((WXHWND) hWnd);
+
+    return (wxMDIChildFrame *)wxFindWinFromHandle(hWnd);

 }
 
 // Create the client window class (don't Create the window, just return a new
 }
 
 // Create the client window class (don't Create the window, just return a new


@@ -341,13 +423,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
+{
+    // we don't have any standard icons (any more)
+    return (WXHICON)0;
+}
+

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


@@ -357,10 +445,14 @@ void wxMDIParentFrame::Cascade()
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0);
 }
 
     ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDICASCADE, 0, 0);
 }
 

-// TODO: add a direction argument (hor/vert)
-void wxMDIParentFrame::Tile()
+void wxMDIParentFrame::Tile(wxOrientation orient)

 {
 {

-    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE, MDITILE_HORIZONTAL, 0);
+    wxASSERT_MSG( orient == wxHORIZONTAL || orient == wxVERTICAL,
+                  _T("invalid orientation value") );
+
+    ::SendMessage(GetWinHwnd(GetClientWindow()), WM_MDITILE,
+                  orient == wxHORIZONTAL ? MDITILE_HORIZONTAL
+                                         : MDITILE_VERTICAL, 0);

 }
 
 void wxMDIParentFrame::ArrangeIcons()
 }
 
 void wxMDIParentFrame::ArrangeIcons()


@@ -382,12 +474,12 @@ void wxMDIParentFrame::ActivatePrevious()
 // the MDI parent frame window proc
 // ---------------------------------------------------------------------------
 
 // the MDI parent frame window proc
 // ---------------------------------------------------------------------------
 

-long wxMDIParentFrame::MSWWindowProc(WXUINT message,
+WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,

                                      WXWPARAM wParam,
                                      WXLPARAM lParam)
 {
                                      WXWPARAM wParam,
                                      WXLPARAM lParam)
 {

-    long rc = 0;
-    bool processed = FALSE;
+    WXLRESULT rc = 0;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {


@@ -410,13 +502,13 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 (void)HandleCommand(id, cmd, hwnd);
 
                 // even if the frame didn't process it, there is no need to try it
                 (void)HandleCommand(id, cmd, hwnd);
 
                 // 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,
+                // once again (i.e. call wxFrame::HandleCommand()) - we just did it,

                 // so pretend we processed the message anyhow
                 // 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

-            // commands (and sys commands - more surprizingly!) won't work
+            // commands (and sys commands - more surprisingly!) won't work

             MSWDefWindowProc(message, wParam, lParam);
             break;
 
             MSWDefWindowProc(message, wParam, lParam);
             break;
 


@@ -430,38 +522,19 @@ 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;
-            break;
-
-        case WM_MENUSELECT:
-            {
-                WXWORD item, flags;
-                WXHMENU hmenu;
-                UnpackMenuSelect(wParam, lParam, &item, &flags, &hmenu);
-
-                if ( m_parentFrameActive )
-                {
-                    processed = HandleMenuSelect(item, flags, hmenu);
-                }
-                else if (m_currentChild)
-                {
-                    processed = m_currentChild->
-                        HandleMenuSelect(item, flags, hmenu);
-                }
-            }
+            rc = true;

             break;
 
         case WM_SIZE:
             break;
 
         case WM_SIZE:

-            // as we don't (usually) resize the MDI client to exactly fit the
-            // client area (we put it below the toolbar, above statusbar &c),
-            // we should not pass this one to DefFrameProc
+            // though we don't (usually) resize the MDI client to exactly fit the
+            // client area we need to pass this one to DefFrameProc to allow the children to show

             break;
     }
 
             break;
     }
 


@@ -473,12 +546,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


@@ -486,17 +559,20 @@ 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 );
         event.SetEventObject( m_currentChild );

-        if ( m_currentChild->GetEventHandler()->ProcessEvent(event) )
-            processed = TRUE;
+        if ( m_currentChild->HandleWindowEvent(event) )
+            processed = true;

     }
 
     return processed;
 }
 
     }
 
     return processed;
 }
 

-bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
+bool wxMDIParentFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd)

 {
 {

+    // sign extend to int from short before comparing with the other int ids
+    int id = (signed short)id_;
+

     // In case it's e.g. a toolbar.
     if ( hwnd )
     {
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {


@@ -505,8 +581,17 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
             return win->MSWCommand(cmd, id);
     }
 
             return win->MSWCommand(cmd, id);
     }
 

+    if (wxCurrentPopupMenu)
+    {
+        wxMenu *popupMenu = wxCurrentPopupMenu;
+        wxCurrentPopupMenu = NULL;
+        if (popupMenu->MSWCommand(cmd, id))
+            return true;
+    }
+

     // 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 )
     {


@@ -532,6 +617,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:


@@ -540,32 +631,32 @@ 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::compatibility_iterator node = GetChildren().GetFirst();

         while ( node )
         {
         while ( node )
         {

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

             if ( child->GetHWND() )
             {
             if ( child->GetHWND() )
             {

-                long childId = wxGetWindowId(child->GetHWND());
-                if (childId == (long)id)
+                int childId = wxGetWindowId(child->GetHWND());
+                if ( childId == (signed short)id )

                 {
                     ::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();


@@ -586,10 +677,10 @@ 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,
+WXLRESULT wxMDIParentFrame::MSWDefWindowProc(WXUINT message,

                                         WXWPARAM wParam,
                                         WXLPARAM lParam)
 {
                                         WXWPARAM wParam,
                                         WXLPARAM lParam)
 {


@@ -610,23 +701,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;

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


@@ -635,7 +726,8 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::Init()
 {
 
 void wxMDIChildFrame::Init()
 {

-    m_needsResize = TRUE;
+    m_needsResize = true;
+    m_needsInitialShow = true;

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


@@ -646,24 +738,18 @@ 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 )
+  if ( id != wxID_ANY )

     m_windowId = id;
   else
     m_windowId = id;
   else

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

 
   if ( parent )
   {
       parent->AddChild(this);
   }
 
 
   if ( parent )
   {
       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;


@@ -671,37 +757,37 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   MDICREATESTRUCT mcs;
 
 
   MDICREATESTRUCT mcs;
 

-  mcs.szClass = style & wxNO_FULL_REPAINT_ON_RESIZE
-                    ? wxMDIChildFrameClassNameNoRedraw
-                    : wxMDIChildFrameClassName;
-  mcs.szTitle = title;
+  mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE
+                    ? wxMDIChildFrameClassName
+                    : wxMDIChildFrameClassNameNoRedraw;
+  mcs.szTitle = title.wx_str();

   mcs.hOwner = wxGetInstance();
   mcs.hOwner = wxGetInstance();

-  if (x > -1)
+  if (x != wxDefaultCoord)

       mcs.x = x;
   else
       mcs.x = CW_USEDEFAULT;
 
       mcs.x = x;
   else
       mcs.x = CW_USEDEFAULT;
 

-  if (y > -1)
+  if (y != wxDefaultCoord)

       mcs.y = y;
   else
       mcs.y = CW_USEDEFAULT;
 
       mcs.y = y;
   else
       mcs.y = CW_USEDEFAULT;
 

-  if (width > -1)
+  if (width != wxDefaultCoord)

       mcs.cx = width;
   else
       mcs.cx = CW_USEDEFAULT;
 
       mcs.cx = width;
   else
       mcs.cx = CW_USEDEFAULT;
 

-  if (height > -1)
+  if (height != wxDefaultCoord)

       mcs.cy = height;
   else
       mcs.cy = CW_USEDEFAULT;
 
       mcs.cy = height;
   else
       mcs.cy = CW_USEDEFAULT;
 

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

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

-  if (style & wxTHICK_FRAME)
+  if (style & wxRESIZE_BORDER)

     msflags |= WS_THICKFRAME;
   if (style & wxSYSTEM_MENU)
     msflags |= WS_SYSMENU;
     msflags |= WS_THICKFRAME;
   if (style & wxSYSTEM_MENU)
     msflags |= WS_SYSMENU;


@@ -716,33 +802,71 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   mcs.lParam = 0;
 
 
   mcs.lParam = 0;
 

+  wxWindowCreationHook hook(this);
+

   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),

-                                 WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
+                                 WM_MDICREATE, 0, (LPARAM)&mcs);

 
 

-  wxWndHook = NULL;
-  wxAssociateWinWithHandle((HWND) GetHWND(), this);
+  if ( !m_hWnd )
+  {
+      wxLogLastError(_T("WM_MDICREATE"));
+      return false;
+  }

 
 

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

 
 

-  wxModelessWindows.Append(this);
+  parent->AddMDIChild(this);

 
 

-  return TRUE;
+  return true;

 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {

-    DestroyChildren();
+    // if we hadn't been created, there is nothing to destroy
+    if ( !m_hWnd )
+        return;

 
 

-    // already delete by DestroyChildren()
+    GetMDIParent()->RemoveMDIChild(this);
+
+    // will be destroyed by DestroyChildren() but reset them before calling it
+    // to avoid using dangling pointers if a callback comes in the meanwhile
+#if wxUSE_TOOLBAR

     m_frameToolBar = NULL;
     m_frameToolBar = NULL;

+#endif
+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR
+
+    DestroyChildren();
+
+    MDIRemoveWindowMenu(NULL, m_hMenu);

 
     MSWDestroyWindow();
 }
 
 
     MSWDestroyWindow();
 }
 

+bool wxMDIChildFrame::Show(bool show)
+{
+    m_needsInitialShow = false;
+
+    if (!wxFrame::Show(show))
+        return false;
+
+    // KH: Without this call, new MDI children do not become active.
+    // This was added here after the same BringWindowToTop call was
+    // removed from wxTopLevelWindow::Show (November 2005)
+    if ( show )
+        ::BringWindowToTop(GetHwnd());
+
+    // we need to refresh the MDI frame window menu to include (or exclude if
+    // we've been hidden) this frame
+    wxMDIParentFrame *parent = GetMDIParent();
+    MDISetMenu(parent->GetClientWindow(), NULL, NULL);
+
+    return true;
+}
+

 // Set the client size (i.e. leave the calculation of borders etc.
 // Set the client size (i.e. leave the calculation of borders etc.

-// to wxWindows)
+// to wxWidgets)

 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
   HWND hWnd = GetHwnd();


@@ -759,12 +883,14 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 
   int actual_width = rect2.right - rect2.left - rect.right + width;
   int actual_height = rect2.bottom - rect2.top - rect.bottom + height;
 

+#if wxUSE_STATUSBAR

   if (GetStatusBar() && GetStatusBar()->IsShown())
   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);
     actual_height += sy;
   }
   if (GetStatusBar() && GetStatusBar()->IsShown())
   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);
     actual_height += sy;
   }

+#endif // wxUSE_STATUSBAR

 
   POINT point;
   point.x = rect2.left;
 
   POINT point;
   point.x = rect2.left;


@@ -772,16 +898,32 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 
   // If there's an MDI parent, must subtract the parent's top left corner
   // since MoveWindow moves relative to the parent
 
   // If there's an MDI parent, must subtract the parent's top left corner
   // since MoveWindow moves relative to the parent

-  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  wxMDIParentFrame *mdiParent = GetMDIParent();

   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   ::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);
+  wxSize size(width, height);
+  wxSizeEvent event(size, m_windowId);

   event.SetEventObject( this );
   event.SetEventObject( this );

-  GetEventHandler()->ProcessEvent(event);
+  HandleWindowEvent(event);
+}
+
+// Unlike other wxTopLevelWindowBase, the mdi child's "GetPosition" is not the
+//  same as its GetScreenPosition
+void wxMDIChildFrame::DoGetScreenPosition(int *x, int *y) const
+{
+  HWND hWnd = GetHwnd();
+
+  RECT rect;
+  ::GetWindowRect(hWnd, &rect);
+  if (x)
+     *x = rect.left;
+  if (y)
+     *y = rect.top;

 }
 
 }
 

+

 void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 {
   RECT rect;
 void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 {
   RECT rect;


@@ -792,25 +934,35 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 
   // Since we now have the absolute screen coords,
   // if there's a parent we must subtract its top left corner
 
   // Since we now have the absolute screen coords,
   // if there's a parent we must subtract its top left corner

-  wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
+  wxMDIParentFrame *mdiParent = GetMDIParent();

   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 

-  *x = point.x;
-  *y = point.y;
+  if (x)
+      *x = point.x;
+  if (y)
+      *y = point.y;

 }
 
 void wxMDIChildFrame::InternalSetMenuBar()
 {
 }
 
 void wxMDIChildFrame::InternalSetMenuBar()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
 

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

 
 

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

 
 

-    parent->m_parentFrameActive = FALSE;
+void wxMDIChildFrame::DetachMenuBar()
+{
+    MDIRemoveWindowMenu(NULL, m_hMenu);
+    wxFrame::DetachMenuBar();
+}
+
+WXHICON wxMDIChildFrame::GetDefaultIcon() const
+{
+    // we don't have any standard icons (any more)
+    return (WXHICON)0;

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


@@ -819,7 +971,7 @@ void wxMDIChildFrame::InternalSetMenuBar()
 
 void wxMDIChildFrame::Maximize(bool maximize)
 {
 
 void wxMDIChildFrame::Maximize(bool maximize)
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()),
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()),


@@ -830,7 +982,7 @@ void wxMDIChildFrame::Maximize(bool maximize)
 
 void wxMDIChildFrame::Restore()
 {
 
 void wxMDIChildFrame::Restore()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,


@@ -840,7 +992,7 @@ void wxMDIChildFrame::Restore()
 
 void wxMDIChildFrame::Activate()
 {
 
 void wxMDIChildFrame::Activate()
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
     if ( parent && parent->GetClientWindow() )
     {
         ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,


@@ -852,12 +1004,12 @@ void wxMDIChildFrame::Activate()
 // MDI window proc and message handlers
 // ---------------------------------------------------------------------------
 
 // MDI window proc and message handlers
 // ---------------------------------------------------------------------------
 

-long wxMDIChildFrame::MSWWindowProc(WXUINT message,
+WXLRESULT wxMDIChildFrame::MSWWindowProc(WXUINT message,

                                     WXWPARAM wParam,
                                     WXLPARAM lParam)
 {
                                     WXWPARAM wParam,
                                     WXLPARAM lParam)
 {

-    long rc = 0;
-    bool processed = FALSE;
+    WXLRESULT rc = 0;
+    bool processed = false;

 
     switch ( message )
     {
 
     switch ( message )
     {


@@ -914,8 +1066,11 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
     return rc;
 }
 
     return rc;
 }
 

-bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
+bool wxMDIChildFrame::HandleCommand(WXWORD id_, WXWORD cmd, WXHWND hwnd)

 {
 {

+    // sign extend to int from short before comparing with the other int ids
+    int id = (signed short)id_;
+

     // In case it's e.g. a toolbar.
     if ( hwnd )
     {
     // In case it's e.g. a toolbar.
     if ( hwnd )
     {


@@ -929,7 +1084,7 @@ 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;
     }
 
     bool processed;


@@ -939,7 +1094,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
     }
     else
     {
     }
     else
     {

-        processed = FALSE;
+        processed = false;

     }
 
     return processed;
     }
 
     return processed;


@@ -949,7 +1104,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
 {
                                         WXHWND hwndAct,
                                         WXHWND hwndDeact)
 {

-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
     HMENU menuToSet = 0;
 
 
     HMENU menuToSet = 0;
 


@@ -957,13 +1112,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;
         }


@@ -973,7 +1128,7 @@ 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();


@@ -982,7 +1137,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
         // that has been activated
         if ( parent_menu && !hwndAct )
         {
         // that has been activated
         if ( parent_menu && !hwndAct )
         {

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

 
             menuToSet = parent_menu;
         }
 
             menuToSet = parent_menu;
         }


@@ -990,16 +1145,13 @@ 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);
     }
 
     wxActivateEvent event(wxEVT_ACTIVATE, activated, m_windowId);


@@ -1007,13 +1159,13 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
     ResetWindowStyle((void *)NULL);
 
 
     ResetWindowStyle((void *)NULL);
 

-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);

 }
 
 bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
 {
     WINDOWPOS *lpPos = (WINDOWPOS *)pos;
 }
 
 bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
 {
     WINDOWPOS *lpPos = (WINDOWPOS *)pos;

-#if defined(__WIN95__)
+

     if (!(lpPos->flags & SWP_NOSIZE))
     {
         RECT rectClient;
     if (!(lpPos->flags & SWP_NOSIZE))
     {
         RECT rectClient;


@@ -1021,21 +1173,15 @@ 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->cy = rectClient.bottom - rectClient.top;
         }
             lpPos->x = rectClient.left;
             lpPos->y = rectClient.top;
             lpPos->cx = rectClient.right - rectClient.left;
             lpPos->cy = rectClient.bottom - rectClient.top;
         }

-        wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
-        if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown())
-        {
-            pFrameWnd->GetToolBar()->Refresh();
-        }

     }
     }

-#endif // Win95

 
 

-    return FALSE;
+    return false;

 }
 
 bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
 }
 
 bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)


@@ -1045,31 +1191,34 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *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
     // 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);
+    bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
+
+    int minWidth = GetMinWidth(),
+        minHeight = GetMinHeight();

 
     // but allow GetSizeHints() to set the min size
 
     // but allow GetSizeHints() to set the min size

-    if ( m_minWidth != -1 )
+    if ( minWidth != wxDefaultCoord )

     {
     {

-        info->ptMinTrackSize.x = m_minWidth;
+        info->ptMinTrackSize.x = minWidth;

 
 

-        processed = TRUE;
+        processed = true;

     }
 
     }
 

-    if ( m_minHeight != -1 )
+    if ( minHeight != wxDefaultCoord )

     {
     {

-        info->ptMinTrackSize.y = m_minHeight;
+        info->ptMinTrackSize.y = minHeight;

 
 

-        processed = TRUE;
+        processed = true;

     }
 
     }
 

-    return TRUE;
+    return processed;

 }
 
 // ---------------------------------------------------------------------------
 // MDI specific message translation/preprocessing
 // ---------------------------------------------------------------------------
 
 }
 
 // ---------------------------------------------------------------------------
 // MDI specific message translation/preprocessing
 // ---------------------------------------------------------------------------
 

-long wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXUINT wParam, WXLPARAM lParam)
+WXLRESULT wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam)

 {
     return DefMDIChildProc(GetHwnd(),
                            (UINT)message, (WPARAM)wParam, (LPARAM)lParam);
 {
     return DefMDIChildProc(GetHwnd(),
                            (UINT)message, (WPARAM)wParam, (LPARAM)lParam);


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

-    return wxFrame::MSWTranslateMessage(msg);
+    // we must pass the parent frame to ::TranslateAccelerator(), otherwise it
+    // doesn't do its job correctly for MDI child menus
+    return MSWDoTranslateMessage(GetMDIParent(), msg);

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


@@ -1086,10 +1237,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {

-    MSWDetachWindowMenu();
-    invalidHandle = GetHwnd();
-
-    wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame *parent = GetMDIParent();

 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     // of things could happen after the child client is destroyed, but before
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     // of things could happen after the child client is destroyed, but before


@@ -1099,10 +1247,8 @@ void wxMDIChildFrame::MSWDestroyWindow()
     SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY,
                 (WPARAM)oldHandle, 0);
 
     SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY,
                 (WPARAM)oldHandle, 0);
 

-    if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
-        ResetWindowStyle((void*) NULL);
-
-    invalidHandle = 0;
+    if (parent->GetActiveChild() == NULL)
+        ResetWindowStyle(NULL);

 
     if (m_hMenu)
     {
 
     if (m_hMenu)
     {


@@ -1117,10 +1263,10 @@ void wxMDIChildFrame::MSWDestroyWindow()
 // style when a child is maximised (a double border looks silly.)
 bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {
 // style when a child is maximised (a double border looks silly.)
 bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
 {

-#if defined(__WIN95__)

     RECT *rect = (RECT *)vrect;
     RECT *rect = (RECT *)vrect;

-    wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
+    wxMDIParentFrame* pFrameWnd = GetMDIParent();

     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();

+

     if (!pChild || (pChild == this))
     {
         HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow());
     if (!pChild || (pChild == this))
     {
         HWND hwndClient = GetWinHwnd(pFrameWnd->GetClientWindow());


@@ -1149,12 +1295,11 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
             if (rect)
                 ::GetClientRect(hwndClient, rect);
 
             if (rect)
                 ::GetClientRect(hwndClient, rect);
 

-            return TRUE;
+            return true;

         }
     }
         }
     }

-#endif // Win95

 
 

-    return FALSE;
+    return false;

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


@@ -1164,15 +1309,13 @@ 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;
 
     DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD |
     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
     DWORD msStyle = MDIS_ALLCHILDSTYLES | WS_VISIBLE | WS_CHILD |


@@ -1183,13 +1326,9 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     if ( style & wxVSCROLL )
         msStyle |= WS_VSCROLL;
 
     if ( style & wxVSCROLL )
         msStyle |= WS_VSCROLL;
 

-#if defined(__WIN95__)

     DWORD exStyle = WS_EX_CLIENTEDGE;
     DWORD exStyle = WS_EX_CLIENTEDGE;

-#else
-    DWORD exStyle = 0;
-#endif

 
 

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

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


@@ -1205,13 +1344,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


@@ -1238,26 +1376,30 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
     // (see OGL studio sample). So check if the position is changed and if so,
     // redraw the MDI child frames.
 
     // (see OGL studio sample). So check if the position is changed and if so,
     // redraw the MDI child frames.
 

-    wxPoint oldPos = GetPosition();
+    const wxPoint oldPos = GetPosition();

 
 

-    wxWindow::DoSetSize(x, y, width, height, sizeFlags);
+    wxWindow::DoSetSize(x, y, width, height, sizeFlags | wxSIZE_FORCE);

 
 

-    wxPoint newPos = GetPosition();
+    const wxPoint newPos = GetPosition();

 
     if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
     {
         if (GetParent())
         {
 
     if ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
     {
         if (GetParent())
         {

-            wxNode* node = GetParent()->GetChildren().First();
+            wxWindowList::compatibility_iterator 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();

             }
         }
     }
             }
         }
     }


@@ -1265,13 +1407,23 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
 
 void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 {
 
 void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 {

+    // wxMSW prior to 2.5.3 created MDI child frames as visible, which resulted
+    // in flicker e.g. when the frame contained controls with non-trivial
+    // layout. Since 2.5.3, the frame is created hidden as all other top level
+    // windows. In order to maintain backward compatibility, the frame is shown
+    // in OnIdle, unless Show(false) was called by the programmer before.
+    if ( m_needsInitialShow )
+    {
+        Show(true);
+    }
+

     // MDI child frames get their WM_SIZE when they're constructed but at this
     // moment they don't have any children yet so all child windows will be
     // positioned incorrectly when they are added later - to fix this, we
     // generate an artificial size event here
     if ( m_needsResize )
     {
     // MDI child frames get their WM_SIZE when they're constructed but at this
     // moment they don't have any children yet so all child windows will be
     // positioned incorrectly when they are added later - to fix this, we
     // 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();
     }


@@ -1285,100 +1437,118 @@ void wxMDIChildFrame::OnIdle(wxIdleEvent& event)
 
 static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
 {
 
 static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
 {

-    ::SendMessage(GetWinHwnd(win), WM_MDISETMENU,
-#ifdef __WIN32__
-                  (WPARAM)hmenuFrame, (LPARAM)hmenuWindow
-#else
-                  0, MAKELPARAM(hmenuFrame, hmenuWindow)
-#endif
-                 );
+    if ( hmenuFrame || hmenuWindow )
+    {
+        if ( !::SendMessage(GetWinHwnd(win),
+                            WM_MDISETMENU,
+                            (WPARAM)hmenuFrame,
+                            (LPARAM)hmenuWindow) )
+        {
+#ifdef __WXDEBUG__
+            DWORD err = ::GetLastError();
+            if ( err )
+                wxLogApiError(_T("SendMessage(WM_MDISETMENU)"), err);
+#endif // __WXDEBUG__
+        }
+    }

 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 

-#ifndef __WIN16__

     ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L);
     ::SendMessage(GetWinHwnd(win), WM_MDIREFRESHMENU, 0, 0L);

-#endif

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

-static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
+static void MDIInsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)

 {
     // Try to insert Window menu in front of Help, otherwise append it.
     HMENU hmenu = (HMENU)menu;
 
     if (subMenu)
     {
 {
     // Try to insert Window menu in front of Help, otherwise append it.
     HMENU hmenu = (HMENU)menu;
 
     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;
+            }
+
+            wxString strBuf(buf);
+            if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) )
+            {
+                success = true;
+                ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
+                             (UINT_PTR)subMenu, _("&Window").wx_str());
+                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_PTR)subMenu, _("&Window").wx_str());

         }
     }
 
         }
     }
 

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

     MDISetMenu(win, hmenu, subMenu);
 }
 
     MDISetMenu(win, hmenu, subMenu);
 }
 

-static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
+static void MDIRemoveWindowMenu(wxWindow *win, WXHMENU menu)

 {
 {

-    // Try to insert Window menu in front of Help, otherwise append it.
-    HMENU hmenu = (HMENU)menu;
-    int N = GetMenuItemCount(hmenu);
-    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")) )
-        {
-            ::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)
 {
 }
 
 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;
     *hwndAct = (WXHWND)lParam;
     *hwndDeact = (WXHWND)wParam;

-#else // Win16
-    *activate = (WXWORD)wParam;
-    *hwndAct = (WXHWND)LOWORD(lParam);
-    *hwndDeact = (WXHWND)HIWORD(lParam);
-#endif // Win32/Win16

 }
 }

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