WinCE warning fix.

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

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 1afd35dd6c1ecac0c47fd1fcbbc0c7d548dfb6c4..4bbb0a2b560ddb44910e41ec62500e7f7f54e2f2 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,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "mdi.h"
 #endif
 
     #pragma implementation "mdi.h"
 #endif
 


@@ -28,6 +28,8 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

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

 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/frame.h"
 #ifndef WX_PRECOMP
     #include "wx/setup.h"
     #include "wx/frame.h"


@@ -43,8 +45,6 @@
     #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"
 


@@ -62,13 +62,11 @@
 // global variables
 // ---------------------------------------------------------------------------
 
 // 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 wxAssociateWinWithHandle(HWND hWnd, wxWindow *win);
 extern void wxRemoveHandleAssociation(wxWindow *win);
 


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

-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

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


@@ -194,7 +192,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
       m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));
   }
 
       m_windowMenu->Append(IDM_WINDOWPREV, _("&Previous"));
   }
 

-  m_parentFrameActive = TRUE;
+  m_parentFrameActive = true;

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


@@ -205,13 +203,15 @@ 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();
 
   WXDWORD exflags;
   WXDWORD msflags = MSWGetCreateWindowFlags(&exflags);
     m_windowId = id;
   else
     m_windowId = NewControlId();
 
   WXDWORD exflags;
   WXDWORD msflags = MSWGetCreateWindowFlags(&exflags);

+  msflags &= ~WS_VSCROLL;
+  msflags &= ~WS_HSCROLL;

 
   if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
                             title,
 
   if ( !wxWindow::MSWCreate(wxMDIFrameClassName,
                             title,


@@ -219,24 +219,26 @@ bool wxMDIParentFrame::Create(wxWindow *parent,
                             msflags,
                             exflags) )
   {
                             msflags,
                             exflags) )
   {

-      return FALSE;
+      return false;

   }
 
   }
 

-  wxModelessWindows.Append(this);
-

   // 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
+
+    DestroyChildren();

 
     if (m_windowMenu)
     {
 
     if (m_windowMenu)
     {


@@ -266,7 +268,7 @@ wxMDIParentFrame::~wxMDIParentFrame()
 
 void wxMDIParentFrame::InternalSetMenuBar()
 {
 
 void wxMDIParentFrame::InternalSetMenuBar()
 {

-    m_parentFrameActive = TRUE;
+    m_parentFrameActive = true;

 
     InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
 }
 
     InsertWindowMenu(GetClientWindow(), m_hMenu, GetMDIWindowMenu(this));
 }


@@ -298,6 +300,34 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
     }
 }
 
     }
 }
 

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

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


@@ -341,8 +371,8 @@ void wxMDIParentFrame::OnSysColourChanged(wxSysColourChangedEvent& event)
 
 WXHICON wxMDIParentFrame::GetDefaultIcon() const
 {
 
 WXHICON wxMDIParentFrame::GetDefaultIcon() const
 {

-    return (WXHICON)(wxSTD_MDIPARENTFRAME_ICON ? wxSTD_MDIPARENTFRAME_ICON
-                                               : wxDEFAULT_MDIPARENTFRAME_ICON);
+    // we don't have any standard icons (any more)
+    return (WXHICON)0;

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


@@ -379,12 +409,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 )
     {


@@ -407,13 +437,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;
 


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

-            processed = TRUE;
+            processed = true;

             break;
 
         case WM_ERASEBKGND:
             break;
 
         case WM_ERASEBKGND:

-            processed = TRUE;
+            processed = true;

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

-            rc = TRUE;
+            rc = true;

             break;
 
         case WM_MENUSELECT:
             break;
 
         case WM_MENUSELECT:


@@ -470,12 +500,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


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

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

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

-            processed = TRUE;
+            processed = true;

     }
 
     return processed;
     }
 
     return processed;


@@ -546,21 +576,21 @@ bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
     {
         ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
 
     {
         ::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() )
             {
                 long childId = wxGetWindowId(child->GetHWND());
             if ( child->GetHWND() )
             {
                 long childId = wxGetWindowId(child->GetHWND());


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

-                    return TRUE;
+                    return true;

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


@@ -590,10 +620,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)
 {


@@ -614,23 +644,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;

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


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

-    m_needsResize = TRUE;
+    m_needsResize = true;

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


@@ -651,9 +681,9 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
                              const wxString& name)
 {
   SetName(name);
                              const wxString& name)
 {
   SetName(name);

-  wxWindowBase::Show(TRUE); // MDI child frame starts off shown
+  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();


@@ -670,32 +700,32 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   MDICREATESTRUCT mcs;
 
 
   MDICREATESTRUCT mcs;
 

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

   mcs.szTitle = title;
   mcs.hOwner = wxGetInstance();
   mcs.szTitle = title;
   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 | WS_VISIBLE ;

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


@@ -722,18 +752,21 @@ bool wxMDIChildFrame::Create(wxMDIParentFrame *parent,
 
   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 
 
   wxAssociateWinWithHandle((HWND) GetHWND(), this);
 

-  wxModelessWindows.Append(this);
-
-  return TRUE;
+  return true;

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

-    DestroyChildren();
-
-    // already deleted by DestroyChildren()
+    // 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();

 
     RemoveWindowMenu(NULL, m_hMenu);
 
 
     RemoveWindowMenu(NULL, m_hMenu);
 


@@ -741,7 +774,7 @@ wxMDIChildFrame::~wxMDIChildFrame()
 }
 
 // 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();


@@ -758,12 +791,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;


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

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

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


@@ -805,13 +840,13 @@ void wxMDIChildFrame::InternalSetMenuBar()
     InsertWindowMenu(parent->GetClientWindow(),
                      m_hMenu, GetMDIWindowMenu(parent));
 
     InsertWindowMenu(parent->GetClientWindow(),
                      m_hMenu, GetMDIWindowMenu(parent));
 

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

 }
 
 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {
 }
 
 WXHICON wxMDIChildFrame::GetDefaultIcon() const
 {

-    return (WXHICON)(wxSTD_MDICHILDFRAME_ICON ? wxSTD_MDICHILDFRAME_ICON
-                                              : wxDEFAULT_MDICHILDFRAME_ICON);
+    // we don't have any standard icons (any more)
+    return (WXHICON)0;

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


@@ -853,12 +888,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 )
     {


@@ -930,7 +965,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;


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

-        processed = FALSE;
+        processed = false;

     }
 
     return processed;
     }
 
     return processed;


@@ -958,13 +993,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;
         }


@@ -974,7 +1009,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();


@@ -983,7 +1018,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;
         }


@@ -991,7 +1026,7 @@ 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 )


@@ -1019,21 +1054,23 @@ 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;
         }

+#if wxUSE_TOOLBAR

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

+#endif

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

-    return FALSE;
+    return false;

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


@@ -1053,24 +1090,24 @@ bool wxMDIChildFrame::HandleGetMinMaxInfo(void *mmInfo)
     {
         info->ptMinTrackSize.x = minWidth;
 
     {
         info->ptMinTrackSize.x = minWidth;
 

-        processed = TRUE;
+        processed = true;

     }
 
     if ( minHeight != -1 )
     {
         info->ptMinTrackSize.y = minHeight;
 
     }
 
     if ( minHeight != -1 )
     {
         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);


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

-            return TRUE;
+            return true;

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

-    return FALSE;
+    return false;

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


@@ -1203,12 +1240,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);
 

-    return TRUE;
+    return true;

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


@@ -1245,16 +1282,20 @@ void wxMDIClientWindow::DoSetSize(int x, int y, int width, int height, int sizeF
     {
         if (GetParent())
         {
     {
         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();

             }
         }
     }
             }
         }
     }


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

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

 
         SendSizeEvent();
     }
 
         SendSizeEvent();
     }


@@ -1294,9 +1335,7 @@ static void MDISetMenu(wxWindow *win, HMENU hmenuFrame, HMENU hmenuWindow)
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 
     wxWindow *parent = win->GetParent();
     wxCHECK_RET( parent, wxT("MDI client without parent frame? weird...") );
 

-#ifndef __WIN16__

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

-#endif

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


@@ -1309,7 +1348,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
     if (subMenu)
     {
         int N = GetMenuItemCount(hmenu);
     if (subMenu)
     {
         int N = GetMenuItemCount(hmenu);

-        bool success = FALSE;
+        bool success = false;

         for ( int i = 0; i < N; i++ )
         {
             wxChar buf[256];
         for ( int i = 0; i < N; i++ )
         {
             wxChar buf[256];


@@ -1323,7 +1362,7 @@ static void InsertWindowMenu(wxWindow *win, WXHMENU menu, HMENU subMenu)
 
             if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
             {
 
             if ( wxStripMenuCodes(wxString(buf)).IsSameAs(_("Help")) )
             {

-                success = TRUE;
+                success = true;

                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
                              (UINT)subMenu, _("&Window"));
                 break;
                 ::InsertMenu(hmenu, i, MF_BYPOSITION | MF_POPUP | MF_STRING,
                              (UINT)subMenu, _("&Window"));
                 break;


@@ -1384,17 +1423,10 @@ static void RemoveWindowMenu(wxWindow *win, WXHMENU menu)
 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_ARCHITECTURE && !defined(__WXUNIVERSAL__)
+#endif // wxUSE_MDI && !defined(__WXUNIVERSAL__)