fixes for compilation with the old mingw32, wxUSE_NORLANDER_HEADERS is always

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index eb34e34f23b705c4d02b32968de1de1f06d1e012..8e213d82129e1bce3be7df131b6a89f9eb2ee02d 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -35,17 +35,25 @@
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"
     #include "wx/app.h"
     #include "wx/utils.h"
     #include "wx/dialog.h"

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

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

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

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

-#if wxUSE_NATIVE_STATUSBAR
-    #include <wx/msw/statbr95.h>
+#if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
+    #include "wx/msw/statbr95.h"

 #endif
 
 #endif
 

+#if wxUSE_TOOLBAR
+    #include "wx/toolbar.h"
+#endif // wxUSE_TOOLBAR
+

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


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

-extern char wxMDIFrameClassName[];
-extern char wxMDIChildFrameClassName[];
+extern const wxChar *wxMDIFrameClassName;
+extern const wxChar *wxMDIChildFrameClassName;

 extern wxWindow *wxWndHook;                 // from window.cpp
 
 extern wxWindow *wxWndHook;                 // from window.cpp
 

-extern wxList *wxWinHandleList;
+extern void wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);

 
 static HWND invalidHandle = 0;
 
 
 static HWND invalidHandle = 0;
 


@@ -94,14 +102,17 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow);
 // the very end if not found
 static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);
 
 // the very end if not found
 static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu);
 

+// Remove the window menu
+static void RemoveWindowMenu(wxWindow *win, WXHMENU menu);
+

 // is this an id of an MDI child?
 inline bool IsMdiCommandId(int id)
 {
     return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
 }
 
 // is this an id of an MDI child?
 inline bool IsMdiCommandId(int id)
 {
     return (id >= wxFIRST_MDI_CHILD) && (id <= wxLAST_MDI_CHILD);
 }
 

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

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


@@ -111,11 +122,9 @@ static UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
 // wxWin macros
 // ---------------------------------------------------------------------------
 
 // wxWin macros
 // ---------------------------------------------------------------------------
 

-#if !USE_SHARED_LIBRARY

     IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIParentFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIChildFrame, wxFrame)
     IMPLEMENT_DYNAMIC_CLASS(wxMDIClientWindow, wxWindow)

-#endif // USE_SHARED_LIBRARY

 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)
 
 BEGIN_EVENT_TABLE(wxMDIParentFrame, wxFrame)
     EVT_SIZE(wxMDIParentFrame::OnSize)


@@ -135,7 +144,7 @@ wxMDIParentFrame::wxMDIParentFrame()
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;
 {
     m_clientWindow = NULL;
     m_currentChild = NULL;

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

     m_parentFrameActive = TRUE;
 }
 
     m_parentFrameActive = TRUE;
 }
 


@@ -151,7 +160,23 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 
   m_clientWindow = NULL;
   m_currentChild = NULL;
 
   m_clientWindow = NULL;
   m_currentChild = NULL;

-  m_windowMenu = 0;
+
+  if (style & wxFRAME_NO_WINDOW_MENU)
+      m_windowMenu = (wxMenu*) NULL;
+  else
+  {
+  // m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), wxT("wxWindowMenu"));
+      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->AppendSeparator();
+      m_windowMenu->Append(4003, wxT("&Arrange Icons"));
+      m_windowMenu->Append(4004, wxT("&Next"));
+  }
+

   m_parentFrameActive = TRUE;
 
   if (!parent)
   m_parentFrameActive = TRUE;
 
   if (!parent)


@@ -172,8 +197,6 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   int width = size.x;
   int height = size.y;
 
   int width = size.x;
   int height = size.y;
 

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

   DWORD msflags = WS_OVERLAPPED;
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;
   DWORD msflags = WS_OVERLAPPED;
   if (style & wxMINIMIZE_BOX)
     msflags |= WS_MINIMIZEBOX;


@@ -190,10 +213,8 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   if (style & wxCAPTION)
     msflags |= WS_CAPTION;
 
   if (style & wxCAPTION)
     msflags |= WS_CAPTION;
 

-  // Adding WS_CLIPCHILDREN causes children not to be properly
-  // drawn when first displaying them.
-//  if (style & wxCLIP_CHILDREN)
-//    msflags |= WS_CLIPCHILDREN;
+  if (style & wxCLIP_CHILDREN)
+    msflags |= WS_CLIPCHILDREN;

 
   wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height,
          msflags);
 
   wxWindow::MSWCreate(m_windowId, parent, wxMDIFrameClassName, this, title, x, y, width, height,
          msflags);


@@ -206,9 +227,15 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();

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

 
 

-    ::DestroyMenu((HMENU)m_windowMenu);
-    m_windowMenu = 0;
+    // ::DestroyMenu((HMENU)m_windowMenu);
+    if (m_windowMenu)
+    {
+        delete m_windowMenu;
+        m_windowMenu = (wxMenu*) NULL;
+    }

 
     if ( m_clientWindow )
     {
 
     if ( m_clientWindow )
     {


@@ -222,13 +249,38 @@ wxMDIParentFrame::~wxMDIParentFrame()
 
 void wxMDIParentFrame::InternalSetMenuBar()
 {
 
 void wxMDIParentFrame::InternalSetMenuBar()
 {

-    HMENU subMenu = GetSubMenu((HMENU) m_windowMenu, 0);
+//    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, subMenu);
 }
 

+void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
+{
+    if (m_windowMenu)
+    {
+        if (GetMenuBar())
+        {
+            // Remove old window menu
+            RemoveWindowMenu(GetClientWindow(), m_hMenu);
+        }
+
+        delete m_windowMenu;
+        m_windowMenu = (wxMenu*) NULL;
+    }
+    if (menu)
+    {
+        m_windowMenu = menu;
+        if (GetMenuBar())
+            InsertWindowMenu(GetClientWindow(), m_hMenu, (HMENU) m_windowMenu->GetHMenu());
+    }
+}
+

 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
     if ( GetClientWindow() )
 void wxMDIParentFrame::OnSize(wxSizeEvent& event)
 {
     if ( GetClientWindow() )


@@ -336,6 +388,10 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 // so pretend we processed the message anyhow
                 processed = TRUE;
             }
                 // so pretend we processed the message anyhow
                 processed = TRUE;
             }

+
+            // always pass this message DefFrameProc(), otherwise MDI menu
+            // commands (and sys commands - more surprizingly!) won't work
+            MSWDefWindowProc(message, wParam, lParam);

             break;
 
         case WM_CREATE:
             break;
 
         case WM_CREATE:


@@ -375,6 +431,12 @@ long wxMDIParentFrame::MSWWindowProc(WXUINT message,
                 }
             }
             break;
                 }
             }
             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
+            break;

     }
 
     if ( !processed )
     }
 
     if ( !processed )


@@ -472,7 +534,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
             if ( child->GetHWND() )
             {
                 long childId = wxGetWindowId(child->GetHWND());
             if ( child->GetHWND() )
             {
                 long childId = wxGetWindowId(child->GetHWND());

-                if (childId == id)
+                if (childId == (long)id)

                 {
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,
                 {
                     ::SendMessage( GetWinHwnd(GetClientWindow()),
                                    WM_MDIACTIVATE,


@@ -495,7 +557,7 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
     {
         // this shouldn't happen because it means that our messages are being
         // lost (they're not sent to the parent frame nor to the children)
     {
         // this shouldn't happen because it means that our messages are being
         // lost (they're not sent to the parent frame nor to the children)

-        wxFAIL_MSG(_T("MDI parent frame is not active, "
+        wxFAIL_MSG(wxT("MDI parent frame is not active, "

                       "yet there is no active MDI child?"));
     }
 
                       "yet there is no active MDI child?"));
     }
 


@@ -525,10 +587,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
         return TRUE;
     }
 
         return TRUE;
     }
 

-    if ( m_acceleratorTable.Ok() &&
-         ::TranslateAccelerator(GetHwnd(),
-                                GetTableHaccel(m_acceleratorTable),
-                                pMsg) )
+    if ( m_acceleratorTable.Translate(this, msg) )

     {
         return TRUE;
     }
     {
         return TRUE;
     }


@@ -625,20 +684,18 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   mcs.lParam = 0;
 
 
   mcs.lParam = 0;
 

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

 
   //handle = (HWND)LOWORD(Return);
   // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)
   m_hWnd = (WXHWND)Return;
 
 
   //handle = (HWND)LOWORD(Return);
   // Must be the DWORRD for WIN32. And in 16 bits, HIWORD=0 (says Microsoft)
   m_hWnd = (WXHWND)Return;
 

-  // This gets reassigned so can't be stored
-//  m_windowId = GetWindowLong((HWND) m_hWnd, GWL_ID);
-

   wxWndHook = NULL;
   wxWndHook = NULL;

-  wxWinHandleList->Append((long)GetHWND(), this);
+  wxAssociateWinWithHandle((HWND) GetHWND(), this);

 
 

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

 
   wxModelessWindows.Append(this);
   return TRUE;
 
   wxModelessWindows.Append(this);
   return TRUE;


@@ -653,7 +710,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 // to wxWindows)
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {
 // to wxWindows)
 void wxMDIChildFrame::DoSetClientSize(int width, int height)
 {

-  HWND hWnd = (HWND) GetHWND();
+  HWND hWnd = GetHwnd();

 
   RECT rect;
   ::GetClientRect(hWnd, &rect);
 
   RECT rect;
   ::GetClientRect(hWnd, &rect);


@@ -667,7 +724,7 @@ 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 (GetStatusBar())
+  if (GetStatusBar() && GetStatusBar()->IsShown())

   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);
   {
     int sx, sy;
     GetStatusBar()->GetSize(&sx, &sy);


@@ -693,7 +750,7 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 {
   RECT rect;
 void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
 {
   RECT rect;

-  GetWindowRect((HWND) GetHWND(), &rect);
+  GetWindowRect(GetHwnd(), &rect);

   POINT point;
   point.x = rect.left;
   point.y = rect.top;
   POINT point;
   point.x = rect.left;
   point.y = rect.top;


@@ -711,7 +768,10 @@ void wxMDIChildFrame::InternalSetMenuBar()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 

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

 
     InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu);
 
 
     InsertWindowMenu(parent->GetClientWindow(), m_hMenu, subMenu);
 


@@ -722,25 +782,35 @@ void wxMDIChildFrame::InternalSetMenuBar()
 // MDI operations
 // ---------------------------------------------------------------------------
 
 // MDI operations
 // ---------------------------------------------------------------------------
 

-void wxMDIChildFrame::Maximize()
+void wxMDIChildFrame::Maximize(bool maximize)

 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )

-        ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIMAXIMIZE, (WPARAM) (HWND) GetHWND(), 0);
+    {
+        ::SendMessage(GetWinHwnd(parent->GetClientWindow()),
+                      maximize ? WM_MDIMAXIMIZE : WM_MDIRESTORE,
+                      (WPARAM)GetHwnd(), 0);
+    }

 }
 
 void wxMDIChildFrame::Restore()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
 }
 
 void wxMDIChildFrame::Restore()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )

-        ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIRESTORE, (WPARAM) (HWND) GetHWND(), 0);
+    {
+        ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIRESTORE,
+                      (WPARAM) GetHwnd(), 0);
+    }

 }
 
 void wxMDIChildFrame::Activate()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )
 }
 
 void wxMDIChildFrame::Activate()
 {
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
     if ( parent && parent->GetClientWindow() )

-        ::SendMessage( (HWND) parent->GetClientWindow()->GetHWND(), WM_MDIACTIVATE, (WPARAM) (HWND) GetHWND(), 0);
+    {
+        ::SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIACTIVATE,
+                      (WPARAM) GetHwnd(), 0);
+    }

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


@@ -767,10 +837,6 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
             }
             break;
 
             }
             break;
 

-        case WM_SIZE:
-            processed = HandleSize(LOWORD(lParam), HIWORD(lParam), wParam);
-            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,
         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,


@@ -785,8 +851,25 @@ long wxMDIChildFrame::MSWWindowProc(WXUINT message,
 
                 processed = HandleMDIActivate(act, hwndAct, hwndDeact);
             }
 
                 processed = HandleMDIActivate(act, hwndAct, hwndDeact);
             }

+            // fall through
+
+        case WM_MOVE:
+            // must pass WM_MOVE to DefMDIChildProc() to recalculate MDI client
+            // scrollbars if necessary
+
+            // fall through
+
+        case WM_SIZE:
+            // must pass WM_SIZE to DefMDIChildProc(), otherwise many weird
+            // things happen
+            MSWDefWindowProc(message, wParam, lParam);

             break;
 
             break;
 

+        case WM_SYSCOMMAND:
+            // DefMDIChildProc handles SC_{NEXT/PREV}WINDOW here, so pass it
+            // the message (the base class version does not)
+            return MSWDefWindowProc(message, wParam, lParam);
+

         case WM_WINDOWPOSCHANGING:
             processed = HandleWindowPosChanging((LPWINDOWPOS)lParam);
             break;
         case WM_WINDOWPOSCHANGING:
             processed = HandleWindowPosChanging((LPWINDOWPOS)lParam);
             break;


@@ -861,7 +944,7 @@ bool wxMDIChildFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
             return TRUE;
     }
 
             return TRUE;
     }
 

-    if (GetMenuBar() && GetMenuBar()->FindItemForId(id))
+    if (GetMenuBar() && GetMenuBar()->FindItem(id))

     {
         ProcessCommand(id);
         return TRUE;
     {
         ProcessCommand(id);
         return TRUE;


@@ -898,7 +981,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
     else if ( m_hWnd == hwndDeact )
     {
         wxASSERT_MSG( parent->m_currentChild == this,
     else if ( m_hWnd == hwndDeact )
     {
         wxASSERT_MSG( parent->m_currentChild == this,

-                      _T("can't deactivate MDI child which wasn't active!") );
+                      wxT("can't deactivate MDI child which wasn't active!") );

 
         activated = FALSE;
         parent->m_currentChild = NULL;
 
         activated = FALSE;
         parent->m_currentChild = NULL;


@@ -919,7 +1002,9 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
     if ( menuToSet )
     {
 
     if ( menuToSet )
     {

-        HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0);
+        HMENU subMenu = (HMENU) 0;
+        if (parent->GetWindowMenu())
+            subMenu = (HMENU) parent->GetWindowMenu()->GetHMenu();

 
         MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu);
     }
 
         MDISetMenu(parent->GetClientWindow(), menuToSet, subMenu);
     }


@@ -937,8 +1022,8 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
     if (!(lpPos->flags & SWP_NOSIZE))
     {
         RECT rectClient;
     if (!(lpPos->flags & SWP_NOSIZE))
     {
         RECT rectClient;

-        DWORD dwExStyle = ::GetWindowLong((HWND) GetHWND(), GWL_EXSTYLE);
-        DWORD dwStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+        DWORD dwExStyle = ::GetWindowLong(GetHwnd(), GWL_EXSTYLE);
+        DWORD dwStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);

         if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
         {
             ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle);
         if (ResetWindowStyle((void *) & rectClient) && (dwStyle & WS_MAXIMIZE))
         {
             ::AdjustWindowRectEx(&rectClient, dwStyle, FALSE, dwExStyle);


@@ -948,7 +1033,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
             lpPos->cy = rectClient.bottom - rectClient.top;
         }
         wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
             lpPos->cy = rectClient.bottom - rectClient.top;
         }
         wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();

-        if (pFrameWnd && pFrameWnd->GetToolBar())
+        if (pFrameWnd && pFrameWnd->GetToolBar() && pFrameWnd->GetToolBar()->IsShown())

         {
             pFrameWnd->GetToolBar()->Refresh();
         }
         {
             pFrameWnd->GetToolBar()->Refresh();
         }


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

-    MSG *pMsg = (MSG *)msg;
-    if ( m_acceleratorTable.Ok() )
-    {
-        return ::TranslateAccelerator(GetWinHwnd(GetParent()),
-                                      GetTableHaccel(m_acceleratorTable),
-                                      pMsg) != 0;
-    }
-
-    return FALSE;
+    return m_acceleratorTable.Translate(GetParent(), msg);

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


@@ -988,7 +1065,7 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 void wxMDIChildFrame::MSWDestroyWindow()
 {
     MSWDetachWindowMenu();
 void wxMDIChildFrame::MSWDestroyWindow()
 {
     MSWDetachWindowMenu();

-    invalidHandle = (HWND) GetHWND();
+    invalidHandle = GetHwnd();

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


@@ -997,11 +1074,8 @@ void wxMDIChildFrame::MSWDestroyWindow()
     // the wxFrame is destroyed.
 
     HWND oldHandle = (HWND)GetHWND();
     // the wxFrame is destroyed.
 
     HWND oldHandle = (HWND)GetHWND();

-#ifdef __WIN32__
-    SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (WPARAM)oldHandle, (LPARAM)0);
-#else
-    SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0);
-#endif
+    SendMessage(GetWinHwnd(parent->GetClientWindow()), WM_MDIDESTROY,
+                (WPARAM)oldHandle, 0);

     invalidHandle = 0;
 
     if (m_hMenu)
     invalidHandle = 0;
 
     if (m_hMenu)


@@ -1022,8 +1096,8 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     if (!pChild || (pChild == this))
     {
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     if (!pChild || (pChild == this))
     {

-        DWORD dwStyle = ::GetWindowLong((HWND) pFrameWnd->GetClientWindow()->GetHWND(), GWL_EXSTYLE);
-        DWORD dwThisStyle = ::GetWindowLong((HWND) GetHWND(), GWL_STYLE);
+        DWORD dwStyle = ::GetWindowLong(GetWinHwnd(pFrameWnd->GetClientWindow()), GWL_EXSTYLE);
+        DWORD dwThisStyle = ::GetWindowLong(GetHwnd(), GWL_STYLE);

         DWORD dwNewStyle = dwStyle;
         if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);
         DWORD dwNewStyle = dwStyle;
         if (pChild != NULL && (dwThisStyle & WS_MAXIMIZE))
             dwNewStyle &= ~(WS_EX_CLIENTEDGE);


@@ -1063,7 +1137,9 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     m_windowStyle = style;
     m_parent = parent;
 
     m_windowStyle = style;
     m_parent = parent;
 

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

     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
     DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;
     ccs.idFirstChild = wxFIRST_MDI_CHILD;
 
     DWORD msStyle = WS_VISIBLE | WS_CHILD | WS_CLIPCHILDREN;


@@ -1082,7 +1158,7 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,
     m_hWnd = (WXHWND)::CreateWindowEx
                        (
                         exStyle,

-                        "MDICLIENT",
+                        wxT("MDICLIENT"),

                         NULL,
                         msStyle,
                         0, 0, 0, 0,
                         NULL,
                         msStyle,
                         0, 0, 0, 0,


@@ -1135,7 +1211,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();

-    wxCHECK_RET( parent, "MDI client without parent frame? weird..." );
+    wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );

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


@@ -1144,38 +1220,71 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
 {
     // Try to insert Window menu in front of Help, otherwise append it.
     HMENU hmenu = (HMENU)menu;
 {
     // 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++ )
     {
     int N = GetMenuItemCount(hmenu);
     bool success = FALSE;
     for ( int i = 0; i < N; i++ )
     {

-        char buf[256];
+        wxChar buf[256];

         int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
         if ( chars == 0 )
         {
         int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
         if ( chars == 0 )
         {

-            wxLogLastError("GetMenuString");
+            wxLogLastError(wxT("GetMenuString"));

 
             continue;
         }
 
 
             continue;
         }
 

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

         {
             success = TRUE;
             ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
         {
             success = TRUE;
             ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,

-                         (UINT)subMenu, "&Window");
+                         (UINT)subMenu, wxT("&Window"));

             break;
         }
     }
 
     if ( !success )
     {
             break;
         }
     }
 
     if ( !success )
     {

-        ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, _("&Window"));
+        ::AppendMenu(hmenu, MF_POPUP, (UINT)subMenu, wxT("&Window"));
+    }

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

-static UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
-                         WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)
+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++ )
+    {
+        wxChar buf[256];
+        int chars = GetMenuString(hmenu, i, buf, WXSIZEOF(buf), MF_BYPOSITION);
+        if ( chars == 0 )
+        {
+            wxLogLastError(wxT("GetMenuString"));
+
+            continue;
+        }
+
+        if ( wxStripMenuCodes(wxString(buf)).IsSameAs(wxT("Window")) )
+        {
+            success = TRUE;
+            ::RemoveMenu(hmenu, i, MF_BYPOSITION);
+            break;
+        }
+    }
+
+    // Does passing 0 for the window menu really work with WM_MDISETMENU?
+    MDISetMenu(win, hmenu, 0);
+}
+
+static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
+                              WXWORD *activate, WXHWND *hwndAct, WXHWND *hwndDeact)

 {
 #ifdef __WIN32__
     *activate = TRUE;
 {
 #ifdef __WIN32__
     *activate = TRUE;