Move wxCocoa's wxFontRefData from the header to the implementation file.

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 72ba895be88e9ab97db486ce46dfb91d66fa0920..7114765e93ab331640e7612d3386d34ab33b4a10 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -17,10 +17,6 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,56 +24,47 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_MDI_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#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"
 
 #if wxUSE_STATUSBAR && wxUSE_NATIVE_STATUSBAR
     #include "wx/msw/statbr95.h"
 #endif
 
 #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 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_WINDOWTILEHOR  = 4001;
 static const int IDM_WINDOWCASCADE = 4002;
 static const int IDM_WINDOWICONS = 4003;


@@ -89,10 +76,6 @@ static const int IDM_WINDOWPREV = 4006;
 static const int wxFIRST_MDI_CHILD = 4100;
 static const int wxLAST_MDI_CHILD = 4600;
 
 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
 // ---------------------------------------------------------------------------


@@ -139,6 +122,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()
 


@@ -204,7 +188,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   if ( parent )
       parent->AddChild(this);
 
   if ( parent )
       parent->AddChild(this);
 

-  if ( id > -1 )
+  if ( id != wxID_ANY )

     m_windowId = id;
   else
     m_windowId = NewControlId();
     m_windowId = id;
   else
     m_windowId = NewControlId();


@@ -215,7 +199,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   msflags &= ~WS_HSCROLL;
 
   if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
   msflags &= ~WS_HSCROLL;
 
   if ( !wxWindow::MSWCreate(wxMDIFrameClassName,

-                            title,
+                            title.wx_str(),

                             pos, size,
                             msflags,
                             exflags) )
                             pos, size,
                             msflags,
                             exflags) )


@@ -223,7 +207,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
       return false;
   }
 
       return false;
   }
 

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

 
   // unlike (almost?) all other windows, frames are created hidden
   m_isShown = false;
 
   // unlike (almost?) all other windows, frames are created hidden
   m_isShown = false;


@@ -237,7 +221,9 @@ wxMDIParentFrame::~wxMDIParentFrame()
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif
 #if wxUSE_TOOLBAR
     m_frameToolBar = NULL;
 #endif

+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR

 
     DestroyChildren();
 
 
     DestroyChildren();
 


@@ -301,7 +287,46 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
     }
 }
 
     }
 }
 

-void wxMDIParentFrame::OnSize(wxSizeEvent&)
+void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
+{
+    wxMDIChildFrame *child = GetActiveChild();
+    if ( child )
+    {
+        wxEvtHandler* source = child->GetEventHandler();
+        wxMenuBar* bar = child->GetMenuBar();
+
+        if (menu)
+        {
+            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::UpdateClientSize()

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


@@ -312,6 +337,23 @@ 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.Iconized() )
+    {
+        UpdateClientSize();
+    }
+}
+

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


@@ -357,10 +399,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()


@@ -440,28 +486,9 @@ WXLRESULT wxMDIParentFrame::MSWWindowProc(WXUINT message,
             rc = true;
             break;
 
             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);
-                }
-            }
-            break;
-

         case WM_SIZE:
         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;
     }
 


@@ -505,6 +532,14 @@ 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;
     WXLPARAM lParam = 0;
     // is it one of standard MDI commands?
     WXWPARAM wParam = 0;
     WXLPARAM lParam = 0;


@@ -643,6 +678,7 @@ bool wxMDIParentFrame::MSWTranslateMessage(WXMSG* msg)
 void wxMDIChildFrame::Init()
 {
     m_needsResize = true;
 void wxMDIChildFrame::Init()
 {
     m_needsResize = true;

+    m_needsInitialShow = true;

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


@@ -654,9 +690,8 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
   SetName(name);
                              const wxString& 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 = (int)NewControlId();
     m_windowId = id;
   else
     m_windowId = (int)NewControlId();


@@ -676,34 +711,34 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE
                     ? wxMDIChildFrameClassName
                     : wxMDIChildFrameClassNameNoRedraw;
   mcs.szClass = style & wxFULL_REPAINT_ON_RESIZE
                     ? wxMDIChildFrameClassName
                     : wxMDIChildFrameClassNameNoRedraw;

-  mcs.szTitle = title;
+  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_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;


@@ -723,21 +758,31 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
                                  WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
 
   m_hWnd = (WXHWND)::SendMessage(GetWinHwnd(parent->GetClientWindow()),
                                  WM_MDICREATE, 0, (LONG)(LPSTR)&mcs);
 

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

 
 

-  wxModelessWindows.Append(this);
+  SubclassWin(m_hWnd);

 
   return true;
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {
 
   return true;
 }
 
 wxMDIChildFrame::~wxMDIChildFrame()
 {

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

     // 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;
 #endif
     // 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;
 #endif

+#if wxUSE_STATUSBAR

     m_frameStatusBar = NULL;
     m_frameStatusBar = NULL;

+#endif // wxUSE_STATUSBAR

 
     DestroyChildren();
 
 
     DestroyChildren();
 


@@ -746,8 +791,29 @@ wxMDIChildFrame::~wxMDIChildFrame()
     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 = (wxMDIParentFrame *)GetParent();
+    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();


@@ -764,12 +830,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;


@@ -782,11 +850,27 @@ void wxMDIChildFrame::DoSetClientSize(int width, int height)
 
   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 );
   GetEventHandler()->ProcessEvent(event);
 }
 
   event.SetEventObject( this );
   GetEventHandler()->ProcessEvent(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;


@@ -800,8 +884,10 @@ void wxMDIChildFrame::DoGetPosition(int *x, int *y) const
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::ScreenToClient((HWND) mdiParent->GetClientWindow()->GetHWND(), &point);
 
   wxMDIParentFrame *mdiParent = (wxMDIParentFrame *)GetParent();
   ::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()


@@ -814,6 +900,12 @@ void wxMDIChildFrame::InternalSetMenuBar()
     parent->m_parentFrameActive = false;
 }
 
     parent->m_parentFrameActive = false;
 }
 

+void wxMDIChildFrame::DetachMenuBar()
+{
+    RemoveWindowMenu(NULL, m_hMenu);
+    wxFrame::DetachMenuBar();
+}
+

 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {
     // we don't have any standard icons (any more)
 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {
     // we don't have any standard icons (any more)


@@ -1017,7 +1109,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 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;


@@ -1031,15 +1123,7 @@ bool wxMDIChildFrame::HandleWindowPosChanging(void *pos)
             lpPos->cx = rectClient.right - rectClient.left;
             lpPos->cy = rectClient.bottom - rectClient.top;
         }
             lpPos->cx = rectClient.right - rectClient.left;
             lpPos->cy = rectClient.bottom - rectClient.top;
         }

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

     }
     }

-#endif // Win95

 
     return false;
 }
 
     return false;
 }


@@ -1057,14 +1141,14 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
         minHeight = GetMinHeight();
 
     // but allow GetSizeHints() to set the min size
         minHeight = GetMinHeight();
 
     // but allow GetSizeHints() to set the min size

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

     {
         info->ptMinTrackSize.x = minWidth;
 
         processed = true;
     }
 
     {
         info->ptMinTrackSize.x = minWidth;
 
         processed = true;
     }
 

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

     {
         info->ptMinTrackSize.y = minHeight;
 
     {
         info->ptMinTrackSize.y = minHeight;
 


@@ -1086,7 +1170,9 @@ WXLRESULT wxMDIChildFrame::MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXL
 
 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((wxMDIChildFrame *)GetParent(), msg);

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


@@ -1095,8 +1181,6 @@ bool wxMDIChildFrame::MSWTranslateMessage(WXMSG* msg)
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {
 
 void wxMDIChildFrame::MSWDestroyWindow()
 {

-    invalidHandle = GetHwnd();
-

     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts
     wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent();
 
     // Must make sure this handle is invalidated (set to NULL) since all sorts


@@ -1110,8 +1194,6 @@ void wxMDIChildFrame::MSWDestroyWindow()
     if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
         ResetWindowStyle((void*) NULL);
 
     if (parent->GetActiveChild() == (wxMDIChildFrame*) NULL)
         ResetWindowStyle((void*) NULL);
 

-    invalidHandle = 0;
-

     if (m_hMenu)
     {
         ::DestroyMenu((HMENU) m_hMenu);
     if (m_hMenu)
     {
         ::DestroyMenu((HMENU) m_hMenu);


@@ -1125,10 +1207,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;
     wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();
     RECT *rect = (RECT *)vrect;
     wxMDIParentFrame* pFrameWnd = (wxMDIParentFrame *)GetParent();
     wxMDIChildFrame* pChild = pFrameWnd->GetActiveChild();

+

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


@@ -1160,7 +1242,6 @@ bool wxMDIChildFrame::ResetWindowStyle(void *vrect)
             return true;
         }
     }
             return true;
         }
     }

-#endif // Win95

 
     return false;
 }
 
     return false;
 }


@@ -1189,11 +1270,7 @@ 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

 
     wxWindowCreationHook hook(this);
     m_hWnd = (WXHWND)::CreateWindowEx
 
     wxWindowCreationHook hook(this);
     m_hWnd = (WXHWND)::CreateWindowEx


@@ -1243,11 +1320,11 @@ 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 ((newPos.x != oldPos.x) || (newPos.y != oldPos.y))
     {


@@ -1274,6 +1351,16 @@ 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
     // 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


@@ -1294,13 +1381,20 @@ 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();
 
     // update menu bar of the parent window
     wxWindow *parent = win->GetParent();


@@ -1331,18 +1425,19 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
                 continue;
             }
 
                 continue;
             }
 

-            if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
+            wxString strBuf(buf);
+            if ( wxStripMenuCodes(strBuf) == wxGetStockLabel(wxID_HELP,false) )

             {
                 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, _("&Window").wx_str());

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

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

         }
     }
 
         }
     }
 


@@ -1399,6 +1494,4 @@ static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,
     *hwndDeact = (WXHWND)wParam;
 }
 
     *hwndDeact = (WXHWND)wParam;
 }
 

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