cleanup in toplevel activation, and switching to native carbon event notification...

[wxWidgets.git] / src / common / wincmn.cpp

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 61402fabf07df6ae8a03f26cfd473fc83ee13881..5f892e172dc637e8bf3573b686082e63cc2b81ab 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

     #pragma implementation "windowbase.h"
 #endif
 
     #pragma implementation "windowbase.h"
 #endif
 


@@ -95,7 +95,7 @@ BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
     EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
 
 #if wxUSE_HELP
     EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
 
 #if wxUSE_HELP

-    EVT_HELP(-1, wxWindowBase::OnHelp)
+    EVT_HELP(wxID_ANY, wxWindowBase::OnHelp)

 #endif // wxUSE_HELP
 
 END_EVENT_TABLE()
 #endif // wxUSE_HELP
 
 END_EVENT_TABLE()


@@ -109,12 +109,11 @@ END_EVENT_TABLE()
 // ----------------------------------------------------------------------------
 
 // the default initialization
 // ----------------------------------------------------------------------------
 
 // the default initialization

-void wxWindowBase::InitBase()
+wxWindowBase::wxWindowBase()

 {
     // no window yet, no parent nor children
     m_parent = (wxWindow *)NULL;
 {
     // no window yet, no parent nor children
     m_parent = (wxWindow *)NULL;

-    m_windowId = -1;
-    m_children.DeleteContents( FALSE ); // don't auto delete node data
+    m_windowId = wxID_ANY;

 
     // no constraints on the minimal window size
     m_minWidth =
 
     // no constraints on the minimal window size
     m_minWidth =


@@ -122,9 +121,9 @@ void wxWindowBase::InitBase()
     m_maxWidth =
     m_maxHeight = -1;
 
     m_maxWidth =
     m_maxHeight = -1;
 

-    // window is created enabled but it's not visible yet
-    m_isShown = FALSE;
-    m_isEnabled = TRUE;
+    // window are created enabled and visible by default
+    m_isShown =
+    m_isEnabled = true;

 
     // the default event handler is just this window
     m_eventHandler = this;
 
     // the default event handler is just this window
     m_eventHandler = this;


@@ -148,9 +147,9 @@ void wxWindowBase::InitBase()
     // the colours/fonts are default for now
     m_hasBgCol =
     m_hasFgCol =
     // the colours/fonts are default for now
     m_hasBgCol =
     m_hasFgCol =

-    m_hasFont = FALSE;
-    
-    m_isBeingDeleted = FALSE;
+    m_hasFont = false;
+
+    m_isBeingDeleted = false;

 
     // no style bits
     m_exStyle =
 
     // no style bits
     m_exStyle =


@@ -164,7 +163,7 @@ void wxWindowBase::InitBase()
 
     m_windowSizer = (wxSizer *) NULL;
     m_containingSizer = (wxSizer *) NULL;
 
     m_windowSizer = (wxSizer *) NULL;
     m_containingSizer = (wxSizer *) NULL;

-    m_autoLayout = FALSE;
+    m_autoLayout = false;

 
 #if wxUSE_DRAG_AND_DROP
     m_dropTarget = (wxDropTarget *)NULL;
 
 #if wxUSE_DRAG_AND_DROP
     m_dropTarget = (wxDropTarget *)NULL;


@@ -179,7 +178,7 @@ void wxWindowBase::InitBase()
 #endif // wxUSE_CARET
 
 #if wxUSE_PALETTE
 #endif // wxUSE_CARET
 
 #if wxUSE_PALETTE

-    m_hasCustomPalette = FALSE;
+    m_hasCustomPalette = false;

 #endif // wxUSE_PALETTE
 
 #if wxUSE_ACCESSIBILITY
 #endif // wxUSE_PALETTE
 
 #if wxUSE_ACCESSIBILITY


@@ -187,14 +186,16 @@ void wxWindowBase::InitBase()
 #endif
 
     m_virtualSize = wxDefaultSize;
 #endif
 
     m_virtualSize = wxDefaultSize;

-
+    

     m_minVirtualWidth =
     m_minVirtualHeight =
     m_maxVirtualWidth =
     m_maxVirtualHeight = -1;
 
     m_minVirtualWidth =
     m_minVirtualHeight =
     m_maxVirtualWidth =
     m_maxVirtualHeight = -1;
 

+    m_windowVariant = wxWINDOW_VARIANT_NORMAL ;
+

     // Whether we're using the current theme for this window (wxGTK only for now)
     // Whether we're using the current theme for this window (wxGTK only for now)

-    m_themeEnabled = FALSE;
+    m_themeEnabled = false;

 }
 
 // common part of window creation process
 }
 
 // common part of window creation process


@@ -203,7 +204,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
                               const wxPoint& WXUNUSED(pos),
                               const wxSize& WXUNUSED(size),
                               long style,
                               const wxPoint& WXUNUSED(pos),
                               const wxSize& WXUNUSED(size),
                               long style,

-                              const wxValidator& validator,
+                              const wxValidator& wxVALIDATOR_PARAM(validator),

                               const wxString& name)
 {
 #if wxUSE_STATBOX
                               const wxString& name)
 {
 #if wxUSE_STATBOX


@@ -242,7 +243,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
         SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
     }
 
         SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
     }
 

-    return TRUE;
+    return true;

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


@@ -263,18 +264,27 @@ wxWindowBase::~wxWindowBase()
 
     // Just in case we've loaded a top-level window via LoadNativeDialog but
     // we weren't a dialog class
 
     // Just in case we've loaded a top-level window via LoadNativeDialog but
     // we weren't a dialog class

-    wxTopLevelWindows.DeleteObject(this);
+    wxTopLevelWindows.DeleteObject((wxWindow*)this);

 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 

+    // reset the dangling pointer our parent window may keep to us
+    if ( m_parent )
+    {
+        if ( m_parent->GetDefaultItem() == this )
+        {
+            m_parent->SetDefaultItem(NULL);
+        }
+
+        m_parent->RemoveChild(this);
+    }
+

 #if wxUSE_CARET
 #if wxUSE_CARET

-    if ( m_caret )
-        delete m_caret;
+    delete m_caret;

 #endif // wxUSE_CARET
 
 #if wxUSE_VALIDATORS
 #endif // wxUSE_CARET
 
 #if wxUSE_VALIDATORS

-    if ( m_windowValidator )
-        delete m_windowValidator;
+    delete m_windowValidator;

 #endif // wxUSE_VALIDATORS
 
 #if wxUSE_CONSTRAINTS
 #endif // wxUSE_VALIDATORS
 
 #if wxUSE_CONSTRAINTS


@@ -290,61 +300,47 @@ wxWindowBase::~wxWindowBase()
         delete m_constraints;
         m_constraints = NULL;
     }
         delete m_constraints;
         m_constraints = NULL;
     }

-

 #endif // wxUSE_CONSTRAINTS
 
     if ( m_containingSizer )
         m_containingSizer->Detach( (wxWindow*)this );
 
 #endif // wxUSE_CONSTRAINTS
 
     if ( m_containingSizer )
         m_containingSizer->Detach( (wxWindow*)this );
 

-    if ( m_windowSizer )
-        delete m_windowSizer;
+    delete m_windowSizer;

 
 #if wxUSE_DRAG_AND_DROP
 
 #if wxUSE_DRAG_AND_DROP

-    if ( m_dropTarget )
-        delete m_dropTarget;
+    delete m_dropTarget;

 #endif // wxUSE_DRAG_AND_DROP
 
 #if wxUSE_TOOLTIPS
 #endif // wxUSE_DRAG_AND_DROP
 
 #if wxUSE_TOOLTIPS

-    if ( m_tooltip )
-        delete m_tooltip;
+    delete m_tooltip;

 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_ACCESSIBILITY
 #endif // wxUSE_TOOLTIPS
 
 #if wxUSE_ACCESSIBILITY

-    if ( m_accessible )
-        delete m_accessible;
+    delete m_accessible;

 #endif
 #endif

-
-    // reset the dangling pointer our parent window may keep to us
-    if ( m_parent && m_parent->GetDefaultItem() == this )
-    {
-        m_parent->SetDefaultItem(NULL);
-    }

 }
 
 bool wxWindowBase::Destroy()
 {
     delete this;
 
 }
 
 bool wxWindowBase::Destroy()
 {
     delete this;
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::Close(bool force)
 {
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);
 }
 
 bool wxWindowBase::Close(bool force)
 {
     wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId);
     event.SetEventObject(this);

-#if WXWIN_COMPATIBILITY
-    event.SetForce(force);
-#endif // WXWIN_COMPATIBILITY

     event.SetCanVeto(!force);
 
     event.SetCanVeto(!force);
 

-    // return FALSE if window wasn't closed because the application vetoed the
+    // return false if window wasn't closed because the application vetoed the

     // close event
     return GetEventHandler()->ProcessEvent(event) && !event.GetVeto();
 }
 
 bool wxWindowBase::DestroyChildren()
 {
     // close event
     return GetEventHandler()->ProcessEvent(event) && !event.GetVeto();
 }
 
 bool wxWindowBase::DestroyChildren()
 {

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( ;; )
     {
         // we iterate until the list becomes empty
     for ( ;; )
     {
         // we iterate until the list becomes empty


@@ -354,16 +350,17 @@ bool wxWindowBase::DestroyChildren()
 
         wxWindow *child = node->GetData();
 
 
         wxWindow *child = node->GetData();
 

-        wxASSERT_MSG( child, wxT("children list contains empty nodes") );
-
-        child->Show(FALSE);
+        // note that we really want to call delete and not ->Destroy() here
+        // because we want to delete the child immediately, before we are
+        // deleted, and delayed deletion would result in problems as our (top
+        // level) child could outlive its parent

         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),
                       wxT("child didn't remove itself using RemoveChild()") );
     }
 
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),
                       wxT("child didn't remove itself using RemoveChild()") );
     }
 

-    return TRUE;
+    return true;

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


@@ -520,7 +517,7 @@ wxSize wxWindowBase::DoGetBestSize() const
         int maxX = 0,
             maxY = 0;
 
         int maxX = 0,
             maxY = 0;
 

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

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


@@ -554,7 +551,7 @@ wxSize wxWindowBase::DoGetBestSize() const
         int maxX = 0,
             maxY = 0;
 
         int maxX = 0,
             maxY = 0;
 

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

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


@@ -626,6 +623,41 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
     m_maxHeight = maxH;
 }
 
     m_maxHeight = maxH;
 }
 

+void wxWindowBase::SetWindowVariant( wxWindowVariant variant )
+{
+    if ( m_windowVariant == variant )
+        return ;
+    
+    m_windowVariant = variant ; 
+
+    DoSetWindowVariant( variant ) ;
+    return ;
+}
+
+void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
+{
+    wxFont font = wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) ;
+    int size = font.GetPointSize() ;
+    switch ( variant )
+    {
+        case wxWINDOW_VARIANT_NORMAL :
+            break ;
+        case wxWINDOW_VARIANT_SMALL :
+            font.SetPointSize( size * 3 / 4 ) ;
+            break ;
+        case wxWINDOW_VARIANT_MINI :
+            font.SetPointSize( size * 2 / 3 ) ;
+            break ;
+        case wxWINDOW_VARIANT_LARGE :
+            font.SetPointSize( size * 5 / 4 ) ;
+            break ;
+        default:
+            wxFAIL_MSG(_T("unexpected window variant"));
+            break ;
+    }
+    SetFont( font ) ;  
+}
+

 void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
                                         int maxW, int maxH )
 {
 void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
                                         int maxW, int maxH )
 {


@@ -667,11 +699,11 @@ bool wxWindowBase::Show(bool show)
     {
         m_isShown = show;
 
     {
         m_isShown = show;
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


@@ -681,11 +713,11 @@ bool wxWindowBase::Enable(bool enable)
     {
         m_isEnabled = enable;
 
     {
         m_isEnabled = enable;
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

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


@@ -694,7 +726,7 @@ bool wxWindowBase::Enable(bool enable)
 
 bool wxWindowBase::IsTopLevel() const
 {
 
 bool wxWindowBase::IsTopLevel() const
 {

-    return FALSE;
+    return false;

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


@@ -708,9 +740,9 @@ void wxWindowBase::AddChild(wxWindowBase *child)
     // this should never happen and it will lead to a crash later if it does
     // because RemoveChild() will remove only one node from the children list
     // and the other(s) one(s) will be left with dangling pointers in them
     // this should never happen and it will lead to a crash later if it does
     // because RemoveChild() will remove only one node from the children list
     // and the other(s) one(s) will be left with dangling pointers in them

-    wxASSERT_MSG( !GetChildren().Find(child), _T("AddChild() called twice") );
+    wxASSERT_MSG( !GetChildren().Find((wxWindow*)child), _T("AddChild() called twice") );

 
 

-    GetChildren().Append(child);
+    GetChildren().Append((wxWindow*)child);

     child->SetParent(this);
 }
 
     child->SetParent(this);
 }
 


@@ -718,8 +750,8 @@ void wxWindowBase::RemoveChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't remove a NULL child") );
 
 {
     wxCHECK_RET( child, wxT("can't remove a NULL child") );
 

-    GetChildren().DeleteObject(child);
-    child->SetParent((wxWindow *)NULL);
+    GetChildren().DeleteObject((wxWindow *)child);
+    child->SetParent(NULL);

 }
 
 bool wxWindowBase::Reparent(wxWindowBase *newParent)
 }
 
 bool wxWindowBase::Reparent(wxWindowBase *newParent)


@@ -728,7 +760,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     if ( newParent == oldParent )
     {
         // nothing done
     if ( newParent == oldParent )
     {
         // nothing done

-        return FALSE;
+        return false;

     }
 
     // unlink this window from the existing parent.
     }
 
     // unlink this window from the existing parent.


@@ -738,7 +770,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     }
     else
     {
     }
     else
     {

-        wxTopLevelWindows.DeleteObject(this);
+        wxTopLevelWindows.DeleteObject((wxWindow *)this);

     }
 
     // add it to the new one
     }
 
     // add it to the new one


@@ -748,10 +780,10 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     }
     else
     {
     }
     else
     {

-        wxTopLevelWindows.Append(this);
+        wxTopLevelWindows.Append((wxWindow *)this);

     }
 
     }
 

-    return TRUE;
+    return true;

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


@@ -794,7 +826,7 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
 
 bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
 {
 
 bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
 {

-    wxCHECK_MSG( handler, FALSE, _T("RemoveEventHandler(NULL) called") );
+    wxCHECK_MSG( handler, false, _T("RemoveEventHandler(NULL) called") );

 
     wxEvtHandler *handlerPrev = NULL,
                  *handlerCur = GetEventHandler();
 
     wxEvtHandler *handlerPrev = NULL,
                  *handlerCur = GetEventHandler();


@@ -817,9 +849,11 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }
             {
                 handlerNext->SetPreviousHandler ( handlerPrev );
             }

+

             handler->SetNextHandler(NULL);
             handler->SetNextHandler(NULL);

+            handler->SetPreviousHandler(NULL);

 
 

-            return TRUE;
+            return true;

         }
 
         handlerPrev = handlerCur;
         }
 
         handlerPrev = handlerCur;


@@ -828,7 +862,7 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
 
     wxFAIL_MSG( _T("where has the event handler gone?") );
 
 
     wxFAIL_MSG( _T("where has the event handler gone?") );
 

-    return FALSE;
+    return false;

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


@@ -838,25 +872,25 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
 bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
 {
     if ( !colour.Ok() || (colour == m_backgroundColour) )
 bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
 {
     if ( !colour.Ok() || (colour == m_backgroundColour) )

-        return FALSE;
+        return false;

 
     m_backgroundColour = colour;
 
 
     m_backgroundColour = colour;
 

-    m_hasBgCol = TRUE;
+    m_hasBgCol = true;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::SetForegroundColour( const wxColour &colour )
 {
     if ( !colour.Ok() || (colour == m_foregroundColour) )
 }
 
 bool wxWindowBase::SetForegroundColour( const wxColour &colour )
 {
     if ( !colour.Ok() || (colour == m_foregroundColour) )

-        return FALSE;
+        return false;

 
     m_foregroundColour = colour;
 
 
     m_foregroundColour = colour;
 

-    m_hasFgCol = TRUE;
+    m_hasFgCol = true;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)


@@ -866,12 +900,12 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
     if ( m_cursor == cursor )
     {
         // no change
     if ( m_cursor == cursor )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     m_cursor = cursor;
 
     }
 
     m_cursor = cursor;
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::SetFont(const wxFont& font)
 }
 
 bool wxWindowBase::SetFont(const wxFont& font)


@@ -882,21 +916,21 @@ bool wxWindowBase::SetFont(const wxFont& font)
     if ( fontOk == m_font )
     {
         // no change
     if ( fontOk == m_font )
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     m_font = fontOk;
 
     }
 
     m_font = fontOk;
 

-    m_hasFont = TRUE;
+    m_hasFont = true;

 
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_PALETTE
 
 void wxWindowBase::SetPalette(const wxPalette& pal)
 {
 }
 
 #if wxUSE_PALETTE
 
 void wxWindowBase::SetPalette(const wxPalette& pal)
 {

-    m_hasCustomPalette = TRUE;
+    m_hasCustomPalette = true;

     m_palette = pal;
 
     // VZ: can anyone explain me what do we do here?
     m_palette = pal;
 
     // VZ: can anyone explain me what do we do here?


@@ -978,6 +1012,17 @@ bool wxWindowBase::IsExposed(int x, int y, int w, int h) const
     return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
 }
 
     return m_updateRegion.Contains(x, y, w, h) != wxOutRegion;
 }
 

+void wxWindowBase::ClearBackground()
+{
+    // wxGTK uses its own version, no need to add never used code
+#ifndef __WXGTK__
+    wxClientDC dc((wxWindow *)this);
+    wxBrush brush(GetBackgroundColour(), wxSOLID);
+    dc.SetBackground(brush);
+    dc.Clear();
+#endif // __WXGTK__
+}
+

 // ----------------------------------------------------------------------------
 // find child window by id or name
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // find child window by id or name
 // ----------------------------------------------------------------------------


@@ -988,7 +1033,7 @@ wxWindow *wxWindowBase::FindWindow( long id )
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();


@@ -1004,7 +1049,7 @@ wxWindow *wxWindowBase::FindWindow( const wxString& name )
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;
         return (wxWindow *)this;
 
     wxWindowBase *res = (wxWindow *)NULL;

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
     for ( node = m_children.GetFirst(); node && !res; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();


@@ -1060,7 +1105,7 @@ wxWindow *wxFindWindowRecursively(const wxWindow *parent,
             return (wxWindow *)parent;
 
         // It wasn't, so check all its children
             return (wxWindow *)parent;
 
         // It wasn't, so check all its children

-        for ( wxWindowList::Node * node = parent->GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = parent->GetChildren().GetFirst();

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


@@ -1090,7 +1135,7 @@ wxWindow *wxFindWindowHelper(const wxWindow *parent,
     }
 
     // start at very top of wx's windows
     }
 
     // start at very top of wx's windows

-    for ( wxWindowList::Node * node = wxTopLevelWindows.GetFirst();
+    for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

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


@@ -1142,7 +1187,7 @@ void wxWindowBase::MakeModal(bool modal)
     // Disable all other windows
     if ( IsTopLevel() )
     {
     // Disable all other windows
     if ( IsTopLevel() )
     {

-        wxWindowList::Node *node = wxTopLevelWindows.GetFirst();
+        wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1159,24 +1204,24 @@ bool wxWindowBase::Validate()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
         wxValidator *validator = child->GetValidator();
         if ( validator && !validator->Validate((wxWindow *)this) )
         {
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
         wxValidator *validator = child->GetValidator();
         if ( validator && !validator->Validate((wxWindow *)this) )
         {

-            return FALSE;
+            return false;

         }
 
         if ( recurse && !child->Validate() )
         {
         }
 
         if ( recurse && !child->Validate() )
         {

-            return FALSE;
+            return false;

         }
     }
 #endif // wxUSE_VALIDATORS
 
         }
     }
 #endif // wxUSE_VALIDATORS
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::TransferDataToWindow()
 }
 
 bool wxWindowBase::TransferDataToWindow()


@@ -1184,7 +1229,7 @@ bool wxWindowBase::TransferDataToWindow()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindowBase *child = node->GetData();


@@ -1196,7 +1241,7 @@ bool wxWindowBase::TransferDataToWindow()
             wxLog::FlushActive();
 #endif // wxUSE_LOG
 
             wxLog::FlushActive();
 #endif // wxUSE_LOG
 

-            return FALSE;
+            return false;

         }
 
         if ( recurse )
         }
 
         if ( recurse )


@@ -1204,13 +1249,13 @@ bool wxWindowBase::TransferDataToWindow()
             if ( !child->TransferDataToWindow() )
             {
                 // warning already given
             if ( !child->TransferDataToWindow() )
             {
                 // warning already given

-                return FALSE;
+                return false;

             }
         }
     }
 #endif // wxUSE_VALIDATORS
 
             }
         }
     }
 #endif // wxUSE_VALIDATORS
 

-    return TRUE;
+    return true;

 }
 
 bool wxWindowBase::TransferDataFromWindow()
 }
 
 bool wxWindowBase::TransferDataFromWindow()


@@ -1218,7 +1263,7 @@ bool wxWindowBase::TransferDataFromWindow()
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 
 #if wxUSE_VALIDATORS
     bool recurse = (GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) != 0;
 

-    wxWindowList::Node *node;
+    wxWindowList::compatibility_iterator node;

     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();
     for ( node = m_children.GetFirst(); node; node = node->GetNext() )
     {
         wxWindow *child = node->GetData();


@@ -1228,7 +1273,7 @@ bool wxWindowBase::TransferDataFromWindow()
             // nop warning here because the application is supposed to give
             // one itself - we don't know here what might have gone wrongly
 
             // nop warning here because the application is supposed to give
             // one itself - we don't know here what might have gone wrongly
 

-            return FALSE;
+            return false;

         }
 
         if ( recurse )
         }
 
         if ( recurse )


@@ -1236,13 +1281,13 @@ bool wxWindowBase::TransferDataFromWindow()
             if ( !child->TransferDataFromWindow() )
             {
                 // warning already given
             if ( !child->TransferDataFromWindow() )
             {
                 // warning already given

-                return FALSE;
+                return false;

             }
         }
     }
 #endif // wxUSE_VALIDATORS
 
             }
         }
     }
 #endif // wxUSE_VALIDATORS
 

-    return TRUE;
+    return true;

 }
 
 void wxWindowBase::InitDialog()
 }
 
 void wxWindowBase::InitDialog()


@@ -1409,15 +1454,15 @@ void wxWindowBase::AddConstraintReference(wxWindowBase *otherWin)
 {
     if ( !m_constraintsInvolvedIn )
         m_constraintsInvolvedIn = new wxWindowList;
 {
     if ( !m_constraintsInvolvedIn )
         m_constraintsInvolvedIn = new wxWindowList;

-    if ( !m_constraintsInvolvedIn->Find(otherWin) )
-        m_constraintsInvolvedIn->Append(otherWin);
+    if ( !m_constraintsInvolvedIn->Find((wxWindow *)otherWin) )
+        m_constraintsInvolvedIn->Append((wxWindow *)otherWin);

 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
 {
     if ( m_constraintsInvolvedIn )
 }
 
 // REMOVE back-pointer to other windows we're involved with.
 void wxWindowBase::RemoveConstraintReference(wxWindowBase *otherWin)
 {
     if ( m_constraintsInvolvedIn )

-        m_constraintsInvolvedIn->DeleteObject(otherWin);
+        m_constraintsInvolvedIn->DeleteObject((wxWindow *)otherWin);

 }
 
 // Reset any constraints that mention this window
 }
 
 // Reset any constraints that mention this window


@@ -1425,7 +1470,7 @@ void wxWindowBase::DeleteRelatedConstraints()
 {
     if ( m_constraintsInvolvedIn )
     {
 {
     if ( m_constraintsInvolvedIn )
     {

-        wxWindowList::Node *node = m_constraintsInvolvedIn->GetFirst();
+        wxWindowList::compatibility_iterator node = m_constraintsInvolvedIn->GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1444,8 +1489,8 @@ void wxWindowBase::DeleteRelatedConstraints()
                 constr->centreY.ResetIfWin(this);
             }
 
                 constr->centreY.ResetIfWin(this);
             }
 

-            wxWindowList::Node *next = node->GetNext();
-            delete node;
+            wxWindowList::compatibility_iterator next = node->GetNext();
+            m_constraintsInvolvedIn->Erase(node);

             node = next;
         }
 
             node = next;
         }
 


@@ -1458,6 +1503,9 @@ void wxWindowBase::DeleteRelatedConstraints()
 
 void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
 {
 
 void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
 {

+    if ( sizer == m_windowSizer)
+        return;
+    

     if ( deleteOld )
         delete m_windowSizer;
 
     if ( deleteOld )
         delete m_windowSizer;
 


@@ -1516,7 +1564,7 @@ bool wxWindowBase::Layout()
     }
 #endif
 
     }
 #endif
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_CONSTRAINTS
 }
 
 #if wxUSE_CONSTRAINTS


@@ -1540,7 +1588,7 @@ bool wxWindowBase::LayoutPhase2(int *noChanges)
     // Layout grand children
     DoPhase(2);
 
     // Layout grand children
     DoPhase(2);
 

-    return TRUE;
+    return true;

 }
 
 // Do a phase of evaluating child constraints
 }
 
 // Do a phase of evaluating child constraints


@@ -1559,7 +1607,7 @@ bool wxWindowBase::DoPhase(int phase)
         int noChanges = 0;
 
         // loop over all children setting their constraints
         int noChanges = 0;
 
         // loop over all children setting their constraints

-        for ( wxWindowList::Node *node = GetChildren().GetFirst();
+        for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

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


@@ -1594,7 +1642,7 @@ bool wxWindowBase::DoPhase(int phase)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

 }
 
 void wxWindowBase::ResetConstraints()
 }
 
 void wxWindowBase::ResetConstraints()


@@ -1602,17 +1650,17 @@ void wxWindowBase::ResetConstraints()
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

-        constr->left.SetDone(FALSE);
-        constr->top.SetDone(FALSE);
-        constr->right.SetDone(FALSE);
-        constr->bottom.SetDone(FALSE);
-        constr->width.SetDone(FALSE);
-        constr->height.SetDone(FALSE);
-        constr->centreX.SetDone(FALSE);
-        constr->centreY.SetDone(FALSE);
+        constr->left.SetDone(false);
+        constr->top.SetDone(false);
+        constr->right.SetDone(false);
+        constr->bottom.SetDone(false);
+        constr->width.SetDone(false);
+        constr->height.SetDone(false);
+        constr->centreX.SetDone(false);
+        constr->centreY.SetDone(false);

     }
 
     }
 

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow *win = node->GetData();
     while (node)
     {
         wxWindow *win = node->GetData();


@@ -1654,7 +1702,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
 
     if ( recurse )
     {
 
     if ( recurse )
     {

-        wxWindowList::Node *node = GetChildren().GetFirst();
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();


@@ -1674,22 +1722,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
         if ( x != -1 )
         {
             constr->left.SetValue(x);
         if ( x != -1 )
         {
             constr->left.SetValue(x);

-            constr->left.SetDone(TRUE);
+            constr->left.SetDone(true);

         }
         if ( y != -1 )
         {
             constr->top.SetValue(y);
         }
         if ( y != -1 )
         {
             constr->top.SetValue(y);

-            constr->top.SetDone(TRUE);
+            constr->top.SetDone(true);

         }
         if ( w != -1 )
         {
             constr->width.SetValue(w);
         }
         if ( w != -1 )
         {
             constr->width.SetValue(w);

-            constr->width.SetDone(TRUE);
+            constr->width.SetDone(true);

         }
         if ( h != -1 )
         {
             constr->height.SetValue(h);
         }
         if ( h != -1 )
         {
             constr->height.SetValue(h);

-            constr->height.SetDone(TRUE);
+            constr->height.SetDone(true);

         }
     }
 }
         }
     }
 }


@@ -1702,12 +1750,12 @@ void wxWindowBase::MoveConstraint(int x, int y)
         if ( x != -1 )
         {
             constr->left.SetValue(x);
         if ( x != -1 )
         {
             constr->left.SetValue(x);

-            constr->left.SetDone(TRUE);
+            constr->left.SetDone(true);

         }
         if ( y != -1 )
         {
             constr->top.SetValue(y);
         }
         if ( y != -1 )
         {
             constr->top.SetValue(y);

-            constr->top.SetDone(TRUE);
+            constr->top.SetDone(true);

         }
     }
 }
         }
     }
 }


@@ -1782,7 +1830,7 @@ void wxWindowBase::UpdateWindowUI(long flags)
 
     if (flags & wxUPDATE_UI_RECURSE)
     {
 
     if (flags & wxUPDATE_UI_RECURSE)
     {

-        wxWindowList::Node* node = GetChildren().GetFirst();
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

         while (node)
         {
             wxWindow* child = (wxWindow*) node->GetData();
         while (node)
         {
             wxWindow* child = (wxWindow*) node->GetData();


@@ -1800,7 +1848,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
 {
     if ( event.GetSetEnabled() )
         Enable(event.GetEnabled());
 {
     if ( event.GetSetEnabled() )
         Enable(event.GetEnabled());

-    
+

 #if wxUSE_CONTROLS
     if ( event.GetSetText() )
     {
 #if wxUSE_CONTROLS
     if ( event.GetSetText() )
     {


@@ -1827,16 +1875,18 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
                 radiobtn->SetValue(event.GetChecked());
         }
 #endif // wxUSE_RADIOBTN
                 radiobtn->SetValue(event.GetChecked());
         }
 #endif // wxUSE_RADIOBTN

-    }    
+    }

 #endif
 }
 
 #endif
 }
 

+#if 0

 // call internal idle recursively
 // call internal idle recursively

+// may be obsolete (wait until OnIdle scheme stabilises)

 void wxWindowBase::ProcessInternalIdle()
 {
     OnInternalIdle();
 
 void wxWindowBase::ProcessInternalIdle()
 {
     OnInternalIdle();
 

-    wxWindowList::Node  *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while (node)
     {
         wxWindow *child = node->GetData();
     while (node)
     {
         wxWindow *child = node->GetData();


@@ -1844,6 +1894,7 @@ void wxWindowBase::ProcessInternalIdle()
         node = node->GetNext();
     }
 }
         node = node->GetNext();
     }
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // dialog units translations
 
 // ----------------------------------------------------------------------------
 // dialog units translations


@@ -1882,7 +1933,7 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 // propagate the colour change event to the subwindows
 void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {
 // propagate the colour change event to the subwindows
 void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 {

-    wxWindowList::Node *node = GetChildren().GetFirst();
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();

     while ( node )
     {
         // Only propagate to non-top-level windows
     while ( node )
     {
         // Only propagate to non-top-level windows


@@ -1904,7 +1955,7 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
     TransferDataToWindow();
 void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
     TransferDataToWindow();

-    
+

     // Update the UI at this point
     UpdateWindowUI(wxUPDATE_UI_RECURSE);
 }
     // Update the UI at this point
     UpdateWindowUI(wxUPDATE_UI_RECURSE);
 }


@@ -2004,6 +2055,7 @@ wxAccessible* wxWindowBase::CreateAccessible()
 
 #endif
 
 
 #endif
 

+#if !wxUSE_STL

 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // list classes implementation
 // ----------------------------------------------------------------------------


@@ -2012,6 +2064,7 @@ void wxWindowListNode::DeleteData()
 {
     delete (wxWindow *)GetData();
 }
 {
     delete (wxWindow *)GetData();
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // borders
 
 // ----------------------------------------------------------------------------
 // borders


@@ -2102,8 +2155,8 @@ void wxWindowBase::ReleaseMouse()
     //else: stack is empty, no previous capture
 
     wxLogTrace(_T("mousecapture"),
     //else: stack is empty, no previous capture
 
     wxLogTrace(_T("mousecapture"),

-               _T("After ReleaseMouse() mouse is captured by %p"),
-               GetCapture());
+        (const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"),
+        GetCapture());

 }
 
 #if wxUSE_HOTKEY
 }
 
 #if wxUSE_HOTKEY


@@ -2137,10 +2190,9 @@ void wxWindowBase::SendDestroyEvent()
 // event processing
 // ----------------------------------------------------------------------------
 
 // event processing
 // ----------------------------------------------------------------------------
 

-#if wxUSE_VALIDATORS
-
-bool wxWindowBase::TryValidator(wxEvent& event)
+bool wxWindowBase::TryValidator(wxEvent& wxVALIDATOR_PARAM(event))

 {
 {

+#if wxUSE_VALIDATORS

     // Can only use the validator of the window which
     // is receiving the event
     if ( event.GetEventObject() == this )
     // Can only use the validator of the window which
     // is receiving the event
     if ( event.GetEventObject() == this )


@@ -2148,21 +2200,19 @@ bool wxWindowBase::TryValidator(wxEvent& event)
         wxValidator *validator = GetValidator();
         if ( validator && validator->ProcessEvent(event) )
         {
         wxValidator *validator = GetValidator();
         if ( validator && validator->ProcessEvent(event) )
         {

-            return TRUE;
+            return true;

         }
     }
         }
     }

+#endif // wxUSE_VALIDATORS

 
 

-    return FALSE;
+    return false;

 }
 
 }
 

-#endif // wxUSE_VALIDATORS
-

 bool wxWindowBase::TryParent(wxEvent& event)
 {
 bool wxWindowBase::TryParent(wxEvent& event)
 {

-    // Carry on up the parent-child hierarchy, but only if event is a command
-    // event: it wouldn't make sense for a parent to receive a child's size
-    // event, for example
-    if ( event.IsCommandEvent() )
+    // carry on up the parent-child hierarchy if the propgation count hasn't
+    // reached zero yet
+    if ( event.ShouldPropagate() )

     {
         // honour the requests to stop propagation at this window: this is
         // used by the dialogs, for example, to prevent processing the events
     {
         // honour the requests to stop propagation at this window: this is
         // used by the dialogs, for example, to prevent processing the events


@@ -2172,7 +2222,11 @@ bool wxWindowBase::TryParent(wxEvent& event)
         {
             wxWindow *parent = GetParent();
             if ( parent && !parent->IsBeingDeleted() )
         {
             wxWindow *parent = GetParent();
             if ( parent && !parent->IsBeingDeleted() )

+            {
+                wxPropagateOnce propagateOnce(event);
+

                 return parent->GetEventHandler()->ProcessEvent(event);
                 return parent->GetEventHandler()->ProcessEvent(event);

+            }

         }
     }
 
         }
     }
 


@@ -2198,7 +2252,7 @@ wxWindow* wxGetTopLevelParent(wxWindow *win)
 
 // Can return either a child object, or an integer
 // representing the child element, starting from 1.
 
 // Can return either a child object, or an integer
 // representing the child element, starting from 1.

-wxAccStatus wxWindowAccessible::HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject)
+wxAccStatus wxWindowAccessible::HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2223,7 +2277,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
     {
         if (elementId <= (int) GetWindow()->GetChildren().GetCount())
         {
     {
         if (elementId <= (int) GetWindow()->GetChildren().GetCount())
         {

-            win = (wxWindow*) GetWindow()->GetChildren().Nth(elementId-1)->GetData();
+            win = GetWindow()->GetChildren().Item(elementId-1)->GetData();

         }
         else
             return wxACC_FAIL;
         }
         else
             return wxACC_FAIL;


@@ -2241,7 +2295,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId)
 
 // Navigates from fromId to toId/toObject.
 wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
 
 // Navigates from fromId to toId/toObject.
 wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,

-                             int* toId, wxAccessible** toObject)
+                             int* WXUNUSED(toId), wxAccessible** toObject)

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2271,7 +2325,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
     case wxNAVDIR_DOWN:
     case wxNAVDIR_NEXT:
         {
     case wxNAVDIR_DOWN:
     case wxNAVDIR_NEXT:
         {

-            wxWindowList::Node *node = NULL;
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();

             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window
             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window


@@ -2284,12 +2339,12 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())

-                    node = (wxWindowList::Node*) GetWindow()->GetChildren().Nth(fromId-1);
+                    node = GetWindow()->GetChildren().Item(fromId-1);

             }
 
             if (node && node->GetNext())
             {
             }
 
             if (node && node->GetNext())
             {

-                wxWindow* nextWindow = (wxWindow*) node->GetNext()->Data();
+                wxWindow* nextWindow = node->GetNext()->GetData();

                 *toObject = nextWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }
                 *toObject = nextWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }


@@ -2300,7 +2355,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
     case wxNAVDIR_UP:
     case wxNAVDIR_PREVIOUS:
         {
     case wxNAVDIR_UP:
     case wxNAVDIR_PREVIOUS:
         {

-            wxWindowList::Node *node = NULL;
+            wxWindowList::compatibility_iterator node =
+                wxWindowList::compatibility_iterator();

             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window
             if (fromId == 0)
             {
                 // Can't navigate to sibling of this window


@@ -2313,12 +2369,12 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId,
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())
             else
             {
                 if (fromId <= (int) GetWindow()->GetChildren().GetCount())

-                    node = (wxWindowList::Node*) GetWindow()->GetChildren().Nth(fromId-1);
+                    node = GetWindow()->GetChildren().Item(fromId-1);

             }
 
             if (node && node->GetPrevious())
             {
             }
 
             if (node && node->GetPrevious())
             {

-                wxWindow* previousWindow = (wxWindow*) node->GetPrevious()->Data();
+                wxWindow* previousWindow = node->GetPrevious()->GetData();

                 *toObject = previousWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }
                 *toObject = previousWindow->GetOrCreateAccessible();
                 return wxACC_OK;
             }


@@ -2351,7 +2407,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
         title = ((wxButton*) GetWindow())->GetLabel();
     else
         title = GetWindow()->GetName();
         title = ((wxButton*) GetWindow())->GetLabel();
     else
         title = GetWindow()->GetName();

-    
+

     if (!title.IsEmpty())
     {
         *name = title;
     if (!title.IsEmpty())
     {
         *name = title;


@@ -2391,7 +2447,7 @@ wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child)
     if (childId > (int) GetWindow()->GetChildren().GetCount())
         return wxACC_FAIL;
 
     if (childId > (int) GetWindow()->GetChildren().GetCount())
         return wxACC_FAIL;
 

-    wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().Nth(childId-1)->GetData();
+    wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData();

     *child = childWindow->GetOrCreateAccessible();
     if (*child)
         return wxACC_OK;
     *child = childWindow->GetOrCreateAccessible();
     if (*child)
         return wxACC_OK;


@@ -2426,7 +2482,7 @@ wxAccStatus wxWindowAccessible::GetParent(wxAccessible** parent)
 // or > 0 (the action for a child).
 // Return wxACC_NOT_SUPPORTED if there is no default action for this
 // window (e.g. an edit control).
 // or > 0 (the action for a child).
 // Return wxACC_NOT_SUPPORTED if there is no default action for this
 // window (e.g. an edit control).

-wxAccStatus wxWindowAccessible::DoDefaultAction(int childId)
+wxAccStatus wxWindowAccessible::DoDefaultAction(int WXUNUSED(childId))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2441,7 +2497,7 @@ wxAccStatus wxWindowAccessible::DoDefaultAction(int childId)
 // The retrieved string describes the action that is performed on an object,
 // not what the object does as a result. For example, a toolbar button that prints
 // a document has a default action of "Press" rather than "Prints the current document."
 // The retrieved string describes the action that is performed on an object,
 // not what the object does as a result. For example, a toolbar button that prints
 // a document has a default action of "Press" rather than "Prints the current document."

-wxAccStatus wxWindowAccessible::GetDefaultAction(int childId, wxString* actionName)
+wxAccStatus wxWindowAccessible::GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2451,7 +2507,7 @@ wxAccStatus wxWindowAccessible::GetDefaultAction(int childId, wxString* actionNa
 }
 
 // Returns the description for this object or a child.
 }
 
 // Returns the description for this object or a child.

-wxAccStatus wxWindowAccessible::GetDescription(int childId, wxString* description)
+wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* description)

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2467,7 +2523,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int childId, wxString* descriptio
 }
 
 // Returns help text for this object or a child, similar to tooltip text.
 }
 
 // Returns help text for this object or a child, similar to tooltip text.

-wxAccStatus wxWindowAccessible::GetHelpText(int childId, wxString* helpText)
+wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* helpText)

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2484,7 +2540,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int childId, wxString* helpText)
 
 // Returns the keyboard shortcut for this object or child.
 // Return e.g. ALT+K
 
 // Returns the keyboard shortcut for this object or child.
 // Return e.g. ALT+K

-wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int childId, wxString* shortcut)
+wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2520,7 +2576,9 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
     *role = wxROLE_SYSTEM_CLIENT;
     return wxACC_OK;
 
     *role = wxROLE_SYSTEM_CLIENT;
     return wxACC_OK;
 

+    #if 0

     return wxACC_NOT_IMPLEMENTED;
     return wxACC_NOT_IMPLEMENTED;

+    #endif

 }
 
 // Returns a state constant.
 }
 
 // Returns a state constant.


@@ -2550,12 +2608,14 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
     *state = 0;
     return wxACC_OK;
 
     *state = 0;
     return wxACC_OK;
 

+    #if 0

     return wxACC_NOT_IMPLEMENTED;
     return wxACC_NOT_IMPLEMENTED;

+    #endif

 }
 
 // Returns a localized string representing the value for the object
 // or child.
 }
 
 // Returns a localized string representing the value for the object
 // or child.

-wxAccStatus wxWindowAccessible::GetValue(int childId, wxString* strValue)
+wxAccStatus wxWindowAccessible::GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2565,7 +2625,7 @@ wxAccStatus wxWindowAccessible::GetValue(int childId, wxString* strValue)
 }
 
 // Selects the object or child.
 }
 
 // Selects the object or child.

-wxAccStatus wxWindowAccessible::Select(int childId, wxAccSelectionFlags selectFlags)
+wxAccStatus wxWindowAccessible::Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2578,7 +2638,7 @@ wxAccStatus wxWindowAccessible::Select(int childId, wxAccSelectionFlags selectFl
 // If childId is 0 and child is NULL, no object in
 // this subhierarchy has the focus.
 // If this object has the focus, child should be 'this'.
 // If childId is 0 and child is NULL, no object in
 // this subhierarchy has the focus.
 // If this object has the focus, child should be 'this'.

-wxAccStatus wxWindowAccessible::GetFocus(int* childId, wxAccessible** child)
+wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())


@@ -2595,7 +2655,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* childId, wxAccessible** child)
 // - an integer representing the selected child element,
 //   or 0 if this object is selected (GetType() == wxT("long")
 // - a "void*" pointer to a wxAccessible child object
 // - an integer representing the selected child element,
 //   or 0 if this object is selected (GetType() == wxT("long")
 // - a "void*" pointer to a wxAccessible child object

-wxAccStatus wxWindowAccessible::GetSelections(wxVariant* selections)
+wxAccStatus wxWindowAccessible::GetSelections(wxVariant* WXUNUSED(selections))

 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())