reset virtual root to NULL in DeleteAllItems()

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 5869306dda4c8cdd0bc7ae0a42e3cd5f803b3654..1afd35dd6c1ecac0c47fd1fcbbc0c7d548dfb6c4 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -43,6 +43,8 @@
     #include "wx/log.h"
 #endif
 
     #include "wx/log.h"
 #endif
 

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

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


@@ -67,8 +69,6 @@ extern const wxChar *wxMDIFrameClassName;   // from app.cpp
 extern const wxChar *wxMDIChildFrameClassName;
 extern const wxChar *wxMDIChildFrameClassNameNoRedraw;
 
 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 wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 extern void wxRemoveHandleAssociation(wxWindow *win);
 


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

+static const int IDM_WINDOWPREV = 4006;

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


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

+// unpack the parameters of WM_MDIACTIVATE message

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

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

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


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


@@ -186,6 +191,7 @@ 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;


@@ -196,44 +202,22 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
   SetName(name);
   m_windowStyle = style;
 
   SetName(name);
   m_windowStyle = style;
 

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

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

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

 
 

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

 
 

-  DWORD msflags = WS_OVERLAPPED;
-  if (style & wxMINIMIZE_BOX)
-    msflags |= WS_MINIMIZEBOX;
-  if (style & wxMAXIMIZE_BOX)
-    msflags |= WS_MAXIMIZEBOX;
-  if (style & wxTHICK_FRAME)
-    msflags |= WS_THICKFRAME;
-  if (style & wxSYSTEM_MENU)
-    msflags |= WS_SYSMENU;
-  if ((style & wxMINIMIZE) || (style & wxICONIZE))
-    msflags |= WS_MINIMIZE;
-  if (style & wxMAXIMIZE)
-    msflags |= WS_MAXIMIZE;
-  if (style & wxCAPTION)
-    msflags |= WS_CAPTION;
-
-  if (style & wxCLIP_CHILDREN)
-    msflags |= WS_CLIPCHILDREN;
-
-  if ( !wxWindow::MSWCreate(m_windowId,
-                            parent,
-                            wxMDIFrameClassName,
-                            this,
+  if ( !wxWindow::MSWCreate(wxMDIFrameClassName,

                             title,
                             title,

-                            x, y, width, height,
-                            msflags) )
+                            pos, size,
+                            msflags,
+                            exflags) )

   {
       return FALSE;
   }
   {
       return FALSE;
   }


@@ -249,17 +233,25 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();
 wxMDIParentFrame::~wxMDIParentFrame()
 {
     DestroyChildren();

+

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

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

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

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

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


@@ -276,10 +268,7 @@ void wxMDIParentFrame::InternalSetMenuBar()
 {
     m_parentFrameActive = TRUE;
 
 {
     m_parentFrameActive = TRUE;
 

-    wxMenu *menu = GetWindowMenu();
-    HMENU subMenu = menu ? GetHmenuOf(menu) : 0;
-
-    InsertWindowMenu(GetClientWindow(), m_hMenu, subMenu);
+    InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));

 }
 
 #endif // wxUSE_MENUS_NATIVE
 }
 
 #endif // wxUSE_MENUS_NATIVE


@@ -297,6 +286,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }
         delete m_windowMenu;
         m_windowMenu = (wxMenu*) NULL;
     }

+

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


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

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

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

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

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


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

+    WXLPARAM lParam = 0;

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


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

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

             break;
 
         default:
             break;
 
         default:


@@ -541,7 +544,7 @@ 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;
     }


@@ -647,9 +650,6 @@ 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);
   wxWindowBase::Show(TRUE); // MDI child frame starts off shown
 
   SetName(name);
   wxWindowBase::Show(TRUE); // MDI child frame starts off shown
 


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

-  wxWndHook = this;
-

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


@@ -717,15 +715,13 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   mcs.lParam = 0;
 
 
   mcs.lParam = 0;
 

+  wxWindowCreationHook hook(this);
+

   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);
 

-  wxWndHook = NULL;

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

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

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


@@ -735,10 +731,12 @@ wxMDIChildFrame::~wxMDIChildFrame()
 {
     DestroyChildren();
 
 {
     DestroyChildren();
 

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

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

+    RemoveWindowMenu(NULL, m_hMenu);
+

     MSWDestroyWindow();
 }
 
     MSWDestroyWindow();
 }
 


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

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

 
     parent->m_parentFrameActive = FALSE;
 }
 
 
     parent->m_parentFrameActive = FALSE;
 }
 

+WXHICON wxMDIChildFrame::GetDefaultIcon() const
+{
+    return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
+                                              : wxDEFAULT_MDICHILDFRAME_ICON);
+}
+

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


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


@@ -1048,17 +1045,20 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
     // not on the values specified in wxWindow m_max variables
     bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
 
     // not on the values specified in wxWindow m_max variables
     bool processed = MSWDefWindowProc(WM_GETMINMAXINFO, 0, (LPARAM)mmInfo) != 0;
 

+    int minWidth = GetMinWidth(),
+        minHeight = GetMinHeight();
+

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

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

     {
     {

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

 
         processed = TRUE;
     }
 
 
         processed = TRUE;
     }
 

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

     {
     {

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

 
         processed = TRUE;
     }
 
         processed = TRUE;
     }


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

-    MSWDetachWindowMenu();

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


@@ -1165,15 +1164,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 |


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

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

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


@@ -1210,7 +1207,6 @@ bool wxMDIClientWindow::CreateClient(wxMDIParentFrame *parent, long style)
     }
 
     SubclassWin(m_hWnd);
     }
 
     SubclassWin(m_hWnd);

-    wxWndHook = NULL;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -1312,62 +1308,77 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
 
     if (subMenu)
     {
 
     if (subMenu)
     {

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

         {
         {

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

 
 

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

         }
 
         }
 

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

         {
         {

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

         }
     }
 
         }
     }
 

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

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

-    // Try to insert Window menu in front of Help, otherwise append it.
-    HMENU hmenu = (HMENU)menu;
-    int N = GetMenuItemCount(hmenu);
-    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,
 }
 
 static void UnpackMDIActivate(WXWPARAM wParam, WXLPARAM lParam,


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

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