Call CreateControl instead of CreateBase

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index fe662701f14a8a3d1d33ff6b1c51a0cebd3ed711..afcb8f96707a2599fe3617dd51945134fec76237 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     13/07/98
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     13/07/98
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -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
 


@@ -47,6 +47,10 @@
     #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 
     #include "wx/dcclient.h"
 #endif //WX_PRECOMP
 

+#if defined(__WXMAC__) && wxUSE_SCROLLBAR
+    #include "wx/scrolbar.h"
+#endif
+

 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"
 #endif // wxUSE_CONSTRAINTS
 #if wxUSE_CONSTRAINTS
     #include "wx/layout.h"
 #endif // wxUSE_CONSTRAINTS


@@ -95,7 +99,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,22 +113,24 @@ 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 =

+    m_maxWidth = wxDefaultCoord;

     m_minHeight =
     m_minHeight =

-    m_maxWidth =
-    m_maxHeight = -1;
+    m_maxHeight = wxDefaultCoord;

 
 

-    // window is created enabled but it's not visible yet
-    m_isShown = FALSE;
-    m_isEnabled = TRUE;
+    // invalidiated cache value
+    m_bestSizeCache = wxDefaultSize;
+
+    // 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;


@@ -134,32 +140,19 @@ void wxWindowBase::InitBase()
     m_windowValidator = (wxValidator *) NULL;
 #endif // wxUSE_VALIDATORS
 
     m_windowValidator = (wxValidator *) NULL;
 #endif // wxUSE_VALIDATORS
 

-    // use the system default colours
-    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
-    m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
-
-    // don't set the font here for wxMSW as we don't call WM_SETFONT here and
-    // so the font is *not* really set - but calls to SetFont() later won't do
-    // anything because m_font appears to be already set!
-#ifndef __WXMSW__
-    m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
-#endif // __WXMSW__
-
-    // the colours/fonts are default for now
+    // the colours/fonts are default for now, so leave m_font,
+    // m_backgroundColour and m_foregroundColour uninitialized and set those

     m_hasBgCol =
     m_hasFgCol =
     m_hasBgCol =
     m_hasFgCol =

-    m_hasFont = FALSE;
-    
-    m_isBeingDeleted = FALSE;
+    m_hasFont = false;
+    m_inheritBgCol =
+    m_inheritFgCol =
+    m_inheritFont = false;

 
     // no style bits
     m_exStyle =
     m_windowStyle = 0;
 
 
     // no style bits
     m_exStyle =
     m_windowStyle = 0;
 

-    // an optimization for the event processing: checking this flag is much
-    // faster than using IsKindOf(CLASSINFO(wxWindow))
-    m_isWindow = TRUE;
-

 #if wxUSE_CONSTRAINTS
     // no constraints whatsoever
     m_constraints = (wxLayoutConstraints *) NULL;
 #if wxUSE_CONSTRAINTS
     // no constraints whatsoever
     m_constraints = (wxLayoutConstraints *) NULL;


@@ -168,7 +161,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;


@@ -183,7 +176,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


@@ -193,12 +186,17 @@ void wxWindowBase::InitBase()
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =

+    m_maxVirtualWidth = wxDefaultCoord;

     m_minVirtualHeight =
     m_minVirtualHeight =

-    m_maxVirtualWidth =
-    m_maxVirtualHeight = -1;
+    m_maxVirtualHeight = wxDefaultCoord;
+
+    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;
+
+    // VZ: this one shouldn't exist...
+    m_isBeingDeleted = false;

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


@@ -207,14 +205,9 @@ 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)
 {
                               const wxString& name)
 {

-    // m_isWindow is set to TRUE in wxWindowBase::Init() as well as many other
-    // member variables - check that it has been called (will catch the case
-    // when a new ctor is added which doesn't call InitWindow)
-    wxASSERT_MSG( m_isWindow, wxT("Init() must have been called before!") );
-

 #if wxUSE_STATBOX
     // wxGTK doesn't allow to create controls with static box as the parent so
     // this will result in a crash when the program is ported to wxGTK so warn
 #if wxUSE_STATBOX
     // wxGTK doesn't allow to create controls with static box as the parent so
     // this will result in a crash when the program is ported to wxGTK so warn


@@ -228,7 +221,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
 
     // ids are limited to 16 bits under MSW so if you care about portability,
     // it's not a good idea to use ids out of this range (and negative ids are
 
     // ids are limited to 16 bits under MSW so if you care about portability,
     // it's not a good idea to use ids out of this range (and negative ids are

-    // reserved for wxWindows own usage)
+    // reserved for wxWidgets own usage)

     wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
                   _T("invalid id value") );
 
     wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
                   _T("invalid id value") );
 


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

-    return TRUE;
+    return true;

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


@@ -272,18 +265,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


@@ -299,61 +301,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


@@ -363,16 +351,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;

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


@@ -449,8 +438,8 @@ void wxWindowBase::Centre(int direction)
     int width, height;
     GetSize(&width, &height);
 
     int width, height;
     GetSize(&width, &height);
 

-    int xNew = -1,
-        yNew = -1;
+    int xNew = wxDefaultCoord,
+        yNew = wxDefaultCoord;

 
     if ( direction & wxHORIZONTAL )
         xNew = (widthParent - width)/2;
 
     if ( direction & wxHORIZONTAL )
         xNew = (widthParent - width)/2;


@@ -499,7 +488,7 @@ void wxWindowBase::Fit()
 {
     if ( GetChildren().GetCount() > 0 )
     {
 {
     if ( GetChildren().GetCount() > 0 )
     {

-        SetClientSize(DoGetBestSize());
+        SetClientSize(GetBestSize());

     }
     //else: do nothing if we have no children
 }
     }
     //else: do nothing if we have no children
 }


@@ -513,6 +502,24 @@ void wxWindowBase::FitInside()
     }
 }
 
     }
 }
 

+// On Mac, scrollbars are explicitly children.
+#ifdef __WXMAC__
+static bool wxHasRealChildren(const wxWindowBase* win)
+{
+    int realChildCount = 0;
+    
+    for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindow *win = node->GetData();
+        if ( !win->IsTopLevel() && win->IsShown() && !win->IsKindOf(CLASSINFO(wxScrollBar)))
+            realChildCount ++;
+    }
+    return (realChildCount > 0);
+}
+#endif
+

 // return the size best suited for the current window
 wxSize wxWindowBase::DoGetBestSize() const
 {
 // return the size best suited for the current window
 wxSize wxWindowBase::DoGetBestSize() const
 {


@@ -529,7 +536,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() )
         {


@@ -557,18 +564,22 @@ wxSize wxWindowBase::DoGetBestSize() const
         return wxSize(maxX, maxY);
     }
 #endif // wxUSE_CONSTRAINTS
         return wxSize(maxX, maxY);
     }
 #endif // wxUSE_CONSTRAINTS

-    else if ( GetChildren().GetCount() > 0 )
+    else if ( !GetChildren().empty()
+#ifdef __WXMAC__
+              && wxHasRealChildren(this)
+#endif
+              )

     {
     {

-        // our minimal acceptable size is such that all our windows fit inside
+        // our minimal acceptable size is such that all our visible child windows fit inside

         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() )
         {
             wxWindow *win = node->GetData();
               node;
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();

-            if ( win->IsTopLevel()
+            if ( win->IsTopLevel()  || ( ! win->IsShown() )

 #if wxUSE_STATUSBAR
                     || wxDynamicCast(win, wxStatusBar)
 #endif // wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR
                     || wxDynamicCast(win, wxStatusBar)
 #endif // wxUSE_STATUSBAR


@@ -585,9 +596,9 @@ wxSize wxWindowBase::DoGetBestSize() const
 
             // if the window hadn't been positioned yet, assume that it is in
             // the origin
 
             // if the window hadn't been positioned yet, assume that it is in
             // the origin

-            if ( wx == -1 )
+            if ( wx == wxDefaultCoord )

                 wx = 0;
                 wx = 0;

-            if ( wy == -1 )
+            if ( wy == wxDefaultCoord )

                 wy = 0;
 
             win->GetSize(&ww, &wh);
                 wy = 0;
 
             win->GetSize(&ww, &wh);


@@ -604,14 +615,47 @@ wxSize wxWindowBase::DoGetBestSize() const
 
         return wxSize(maxX, maxY);
     }
 
         return wxSize(maxX, maxY);
     }

-    else
+    else // ! has children

     {
     {

-        // for a generic window there is no natural best size - just use the
-        // current one
-        return GetSize();
+        // for a generic window there is no natural best size - just use either the
+        // minimum size if there is one, or the current size
+        if ( GetMinSize().IsFullySpecified() )
+            return GetMinSize();
+        else
+            return GetSize();

     }
 }
 
     }
 }
 

+
+wxSize wxWindowBase::GetBestFittingSize() const
+{
+    // merge the best size with the min size, giving priority to the min size
+    wxSize min = GetMinSize();
+    if (min.x == wxDefaultCoord || min.y == wxDefaultCoord)
+    {
+        wxSize best = GetBestSize();
+        if (min.x == wxDefaultCoord) min.x =  best.x;
+        if (min.y == wxDefaultCoord) min.y =  best.y;
+    }
+    return min;
+}
+
+
+void wxWindowBase::SetBestFittingSize(const wxSize& size)
+{
+    // Set the min size to the size passed in.  This will usually either be
+    // wxDefaultSize or the size passed to this window's ctor/Create function.
+    SetMinSize(size);
+
+    // Merge the size with the best size if needed
+    wxSize best = GetBestFittingSize();
+    
+    // If the current size doesn't match then change it
+    if (GetSize() != best)
+        SetSize(best);
+}
+
+

 // by default the origin is not shifted
 wxPoint wxWindowBase::GetClientAreaOrigin() const
 {
 // by default the origin is not shifted
 wxPoint wxWindowBase::GetClientAreaOrigin() const
 {


@@ -625,8 +669,8 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it

-    wxCHECK_RET( (minW == -1 || maxW == -1 || minW <= maxW) &&
-                    (minH == -1 || maxH == -1 || minH <= maxH),
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),

                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;
                  _T("min width/height must be less than max width/height!") );
 
     m_minWidth = minW;


@@ -635,6 +679,51 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
     m_maxHeight = maxH;
 }
 
     m_maxHeight = maxH;
 }
 

+void wxWindowBase::SetWindowVariant( wxWindowVariant variant )
+{
+    if ( m_windowVariant != variant )
+    {
+        m_windowVariant = variant;
+
+        DoSetWindowVariant(variant);
+    }
+}
+
+void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )
+{
+    // adjust the font height to correspond to our new variant (notice that
+    // we're only called if something really changed)
+    wxFont font = GetFont();
+    int size = font.GetPointSize();
+    switch ( variant )
+    {
+        case wxWINDOW_VARIANT_NORMAL:
+            break;
+
+        case wxWINDOW_VARIANT_SMALL:
+            size *= 3;
+            size /= 4;
+            break;
+
+        case wxWINDOW_VARIANT_MINI:
+            size *= 2;
+            size /= 3;
+            break;
+
+        case wxWINDOW_VARIANT_LARGE:
+            size *= 5;
+            size /= 4;
+            break;
+
+        default:
+            wxFAIL_MSG(_T("unexpected window variant"));
+            break;
+    }
+
+    font.SetPointSize(size);
+    SetFont(font);
+}
+

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


@@ -646,13 +735,13 @@ void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
 
 void wxWindowBase::DoSetVirtualSize( int x, int y )
 {
 
 void wxWindowBase::DoSetVirtualSize( int x, int y )
 {

-    if ( m_minVirtualWidth != -1 && m_minVirtualWidth > x )
+    if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x )

         x = m_minVirtualWidth;
         x = m_minVirtualWidth;

-    if ( m_maxVirtualWidth != -1 && m_maxVirtualWidth < x )
+    if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x )

         x = m_maxVirtualWidth;
         x = m_maxVirtualWidth;

-    if ( m_minVirtualHeight != -1 && m_minVirtualHeight > y )
+    if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y )

         y = m_minVirtualHeight;
         y = m_minVirtualHeight;

-    if ( m_maxVirtualHeight != -1 && m_maxVirtualHeight < y )
+    if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y )

         y = m_maxVirtualHeight;
 
     m_virtualSize = wxSize(x, y);
         y = m_maxVirtualHeight;
 
     m_virtualSize = wxSize(x, y);


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

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 


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

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

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


@@ -703,7 +792,7 @@ bool wxWindowBase::Enable(bool enable)
 
 bool wxWindowBase::IsTopLevel() const
 {
 
 bool wxWindowBase::IsTopLevel() const
 {

-    return FALSE;
+    return false;

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


@@ -717,9 +806,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);
 }
 


@@ -727,8 +816,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)


@@ -737,7 +826,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.


@@ -747,7 +836,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


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

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

     }
 
     }
 

-    return TRUE;
+    return true;

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


@@ -803,7 +892,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();


@@ -826,9 +915,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;


@@ -837,35 +928,114 @@ 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;

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

-// cursors, fonts &c
+// colours, fonts &c

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
+void wxWindowBase::InheritAttributes()

 {
 {

-    if ( !colour.Ok() || (colour == m_backgroundColour) )
-        return FALSE;
+    const wxWindowBase * const parent = GetParent();
+    if ( !parent )
+        return;

 
 

-    m_backgroundColour = colour;
+    // we only inherit attributes which had been explicitly set for the parent
+    // which ensures that this only happens if the user really wants it and
+    // not by default which wouldn't make any sense in modern GUIs where the
+    // controls don't all use the same fonts (nor colours)
+    if ( parent->m_inheritFont && !m_hasFont )
+        SetFont(parent->GetFont());

 
 

-    m_hasBgCol = TRUE;
+    // in addition, there is a possibility to explicitly forbid inheriting
+    // colours at each class level by overriding ShouldInheritColours()
+    if ( ShouldInheritColours() )
+    {
+        if ( parent->m_inheritFgCol && !m_hasFgCol )
+            SetForegroundColour(parent->GetForegroundColour());

 
 

-    return TRUE;
+        if ( parent->m_inheritBgCol && !m_hasBgCol )
+            SetBackgroundColour(parent->GetBackgroundColour());
+    }

 }
 
 }
 

-bool wxWindowBase::SetForegroundColour( const wxColour &colour )
+/* static */ wxVisualAttributes
+wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

 {
 {

-    if ( !colour.Ok() || (colour == m_foregroundColour) )
-        return FALSE;
+    // it is important to return valid values for all attributes from here,
+    // GetXXX() below rely on this
+    wxVisualAttributes attrs;
+    attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
+    attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);

 
 

-    m_foregroundColour = colour;
+    return attrs;
+}
+
+wxColour wxWindowBase::GetBackgroundColour() const
+{
+    if ( !m_backgroundColour.Ok() )
+    {
+        wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") );
+
+        // get our default background colour
+        wxColour colBg = GetDefaultAttributes().colBg;
+
+        // we must return some valid colour to avoid redoing this every time
+        // and also to avoid surprizing the applications written for older
+        // wxWidgets versions where GetBackgroundColour() always returned
+        // something -- so give them something even if it doesn't make sense
+        // for this window (e.g. it has a themed background)
+        if ( !colBg.Ok() )
+            colBg = GetClassDefaultAttributes().colBg;
+
+        return colBg;
+    }
+    else
+        return m_backgroundColour;
+}
+
+wxColour wxWindowBase::GetForegroundColour() const
+{
+    // logic is the same as above
+    if ( !m_hasFgCol && !m_foregroundColour.Ok() )
+    {
+        wxASSERT_MSG( !m_hasFgCol, _T("we have invalid explicit fg colour?") );
+
+        wxColour colFg = GetDefaultAttributes().colFg;

 
 

-    m_hasFgCol = TRUE;
+        if ( !colFg.Ok() )
+            colFg = GetClassDefaultAttributes().colFg;

 
 

-    return TRUE;
+        return colFg;
+    }
+    else
+        return m_foregroundColour;
+}
+
+bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
+{
+    if ( colour == m_backgroundColour ) 
+        return false;
+
+    m_hasBgCol = colour.Ok();
+    m_inheritBgCol = m_hasBgCol;
+    m_backgroundColour = colour;
+    SetThemeEnabled( !m_hasBgCol && !m_foregroundColour.Ok() );
+    return true;
+}
+
+bool wxWindowBase::SetForegroundColour( const wxColour &colour )
+{
+    if (colour == m_foregroundColour )
+        return false;
+
+    m_hasFgCol = colour.Ok();
+    m_inheritFgCol = m_hasFgCol;
+    m_foregroundColour = colour;
+    SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
+    return true;

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


@@ -875,37 +1045,51 @@ 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)
+wxFont wxWindowBase::GetFont() const

 {
 {

-    // don't try to set invalid font, always fall back to the default
-    const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
+    // logic is the same as in GetBackgroundColour()
+    if ( !m_font.Ok() )
+    {
+        wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );
+
+        wxFont font = GetDefaultAttributes().font;
+        if ( !font.Ok() )
+            font = GetClassDefaultAttributes().font;

 
 

-    if ( fontOk == m_font )
+        return font;
+    }
+    else
+        return m_font;
+}
+
+bool wxWindowBase::SetFont(const wxFont& font)
+{
+    if ( font == m_font )

     {
         // no change
     {
         // no change

-        return FALSE;
+        return false;

     }
 
     }
 

-    m_font = fontOk;
+    m_font = font;
+    m_hasFont = font.Ok();
+    m_inheritFont = m_hasFont;

 
 

-    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?


@@ -957,7 +1141,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
     m_windowValidator = (wxValidator *)validator.Clone();
 
     if ( m_windowValidator )
     m_windowValidator = (wxValidator *)validator.Clone();
 
     if ( m_windowValidator )

-        m_windowValidator->SetWindow(this) ;
+        m_windowValidator->SetWindow(this);

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


@@ -987,6 +1171,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
 // ----------------------------------------------------------------------------


@@ -997,7 +1192,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();


@@ -1013,7 +1208,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();


@@ -1069,7 +1264,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() )
         {


@@ -1099,7 +1294,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() )
     {


@@ -1151,7 +1346,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();


@@ -1168,24 +1363,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()


@@ -1193,7 +1388,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();


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

-            return FALSE;
+            return false;

         }
 
         if ( recurse )
         }
 
         if ( recurse )


@@ -1213,13 +1408,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()


@@ -1227,7 +1422,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();


@@ -1237,7 +1432,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 )


@@ -1245,13 +1440,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()


@@ -1418,15 +1613,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


@@ -1434,7 +1629,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();


@@ -1453,8 +1648,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;
         }
 


@@ -1467,6 +1662,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;
 


@@ -1481,6 +1679,19 @@ void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
     sizer->SetSizeHints( (wxWindow*) this );
 }
 
     sizer->SetSizeHints( (wxWindow*) this );
 }
 

+
+void wxWindowBase::SetContainingSizer(wxSizer* sizer)
+{
+    // adding a window to a sizer twice is going to result in fatal and
+    // hard to debug problems later because when deleting the second
+    // associated wxSizerItem we're going to dereference a dangling
+    // pointer; so try to detect this as early as possible
+    wxASSERT_MSG( !sizer || m_containingSizer != sizer,
+                  _T("Adding a window to the same sizer twice?") );
+
+    m_containingSizer = sizer;
+}
+

 #if wxUSE_CONSTRAINTS
 
 void wxWindowBase::SatisfyConstraints()
 #if wxUSE_CONSTRAINTS
 
 void wxWindowBase::SatisfyConstraints()


@@ -1525,7 +1736,7 @@ bool wxWindowBase::Layout()
     }
 #endif
 
     }
 #endif
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_CONSTRAINTS
 }
 
 #if wxUSE_CONSTRAINTS


@@ -1549,7 +1760,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


@@ -1568,7 +1779,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() )
         {


@@ -1603,7 +1814,7 @@ bool wxWindowBase::DoPhase(int phase)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

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


@@ -1611,17 +1822,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();


@@ -1663,7 +1874,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();


@@ -1680,25 +1891,25 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

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

         {
             constr->left.SetValue(x);
         {
             constr->left.SetValue(x);

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

         }
         }

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

         {
             constr->top.SetValue(y);
         {
             constr->top.SetValue(y);

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

         }
         }

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

         {
             constr->width.SetValue(w);
         {
             constr->width.SetValue(w);

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

         }
         }

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

         {
             constr->height.SetValue(h);
         {
             constr->height.SetValue(h);

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

         }
     }
 }
         }
     }
 }


@@ -1708,15 +1919,15 @@ void wxWindowBase::MoveConstraint(int x, int y)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

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

         {
             constr->left.SetValue(x);
         {
             constr->left.SetValue(x);

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

         }
         }

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

         {
             constr->top.SetValue(y);
         {
             constr->top.SetValue(y);

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

         }
     }
 }
         }
     }
 }


@@ -1779,42 +1990,46 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co
 // do Update UI processing for child controls
 // ----------------------------------------------------------------------------
 
 // do Update UI processing for child controls
 // ----------------------------------------------------------------------------
 

-// TODO: should this be implemented for the child window rather
-// than the parent? Then you can override it e.g. for wxCheckBox
-// to do the Right Thing rather than having to assume a fixed number
-// of control classes.
-void wxWindowBase::UpdateWindowUI()
+void wxWindowBase::UpdateWindowUI(long flags)

 {
 {

-#if wxUSE_CONTROLS

     wxUpdateUIEvent event(GetId());
     event.m_eventObject = this;
 
     if ( GetEventHandler()->ProcessEvent(event) )
     {
     wxUpdateUIEvent event(GetId());
     event.m_eventObject = this;
 
     if ( GetEventHandler()->ProcessEvent(event) )
     {

-        if ( event.GetSetEnabled() )
-            Enable(event.GetEnabled());
+        DoUpdateWindowUI(event);
+    }

 
 

-        if ( event.GetSetText() )
+    if (flags & wxUPDATE_UI_RECURSE)
+    {
+        wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+        while (node)

         {
         {

-            wxControl *control = wxDynamicCastThis(wxControl);
-            if ( control )
-            {
-#if wxUSE_TEXTCTRL
-                wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl);
-                if ( text )
-                {
-                       if ( event.GetText() != text->GetValue() )
-                       text->SetValue(event.GetText());
-                }
-                else
-#endif // wxUSE_TEXTCTRL
-                               {
-                                       if ( event.GetText() != control->GetLabel() )
-                       control->SetLabel(event.GetText());
-                }
-            }
+            wxWindow* child = (wxWindow*) node->GetData();
+            child->UpdateWindowUI(flags);
+            node = node->GetNext();

         }
         }

+    }
+}

 
 

+// do the window-specific processing after processing the update event
+// TODO: take specific knowledge out of this function and
+// put in each control's base class. Unfortunately we don't
+// yet have base implementation files for wxCheckBox and wxRadioButton.
+void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
+{
+    if ( event.GetSetEnabled() )
+        Enable(event.GetEnabled());
+
+#if wxUSE_CONTROLS
+    if ( event.GetSetText() )
+    {
+        wxControl *control = wxDynamicCastThis(wxControl);
+        if ( control )
+        {
+            if ( event.GetText() != control->GetLabel() )
+                control->SetLabel(event.GetText());
+        }

 #if wxUSE_CHECKBOX
         wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox);
         if ( checkbox )
 #if wxUSE_CHECKBOX
         wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox);
         if ( checkbox )


@@ -1833,9 +2048,26 @@ void wxWindowBase::UpdateWindowUI()
         }
 #endif // wxUSE_RADIOBTN
     }
         }
 #endif // wxUSE_RADIOBTN
     }

-#endif // wxUSE_CONTROLS
+#endif

 }
 
 }
 

+#if 0
+// call internal idle recursively
+// may be obsolete (wait until OnIdle scheme stabilises)
+void wxWindowBase::ProcessInternalIdle()
+{
+    OnInternalIdle();
+
+    wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+    while (node)
+    {
+        wxWindow *child = node->GetData();
+        child->ProcessInternalIdle();
+        node = node->GetNext();
+    }
+}
+#endif
+

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


@@ -1846,9 +2078,9 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
     int charHeight = GetCharHeight();
     wxPoint pt2(-1, -1);
     if (pt.x != -1)
     int charHeight = GetCharHeight();
     wxPoint pt2(-1, -1);
     if (pt.x != -1)

-        pt2.x = (int) ((pt.x * 4) / charWidth) ;
+        pt2.x = (int) ((pt.x * 4) / charWidth);

     if (pt.y != -1)
     if (pt.y != -1)

-        pt2.y = (int) ((pt.y * 8) / charHeight) ;
+        pt2.y = (int) ((pt.y * 8) / charHeight);

 
     return pt2;
 }
 
     return pt2;
 }


@@ -1859,9 +2091,9 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
     int charHeight = GetCharHeight();
     wxPoint pt2(-1, -1);
     if (pt.x != -1)
     int charHeight = GetCharHeight();
     wxPoint pt2(-1, -1);
     if (pt.x != -1)

-        pt2.x = (int) ((pt.x * charWidth) / 4) ;
+        pt2.x = (int) ((pt.x * charWidth) / 4);

     if (pt.y != -1)
     if (pt.y != -1)

-        pt2.y = (int) ((pt.y * charHeight) / 8) ;
+        pt2.y = (int) ((pt.y * charHeight) / 8);

 
     return pt2;
 }
 
     return pt2;
 }


@@ -1873,7 +2105,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


@@ -1887,12 +2119,19 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }

+
+    Refresh();

 }
 
 }
 

-// the default action is to populate dialog with data when it's created
+// the default action is to populate dialog with data when it's created,
+// and nudge the UI into displaying itself correctly in case
+// we've turned the wxUpdateUIEvents frequency down low.

 void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
     TransferDataToWindow();
 void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 {
     TransferDataToWindow();

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

 }
 
 // process Ctrl-Alt-mclick
 }
 
 // process Ctrl-Alt-mclick


@@ -1935,7 +2174,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 
         wxMessageBox(wxString::Format(
                                       _T(
 
         wxMessageBox(wxString::Format(
                                       _T(

-                                        "       wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n   Copyright (c) 1995-2002 wxWindows team"
+                                        "       wxWidgets Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n   Copyright (c) 1995-2002 wxWidgets team"

                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,
                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,


@@ -1949,7 +2188,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
                                       __TDATE__,
                                       __TTIME__
                                      ),
                                       __TDATE__,
                                       __TTIME__
                                      ),

-                     _T("wxWindows information"),
+                     _T("wxWidgets information"),

                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
     }
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
     }


@@ -1990,6 +2229,7 @@ wxAccessible* wxWindowBase::CreateAccessible()
 
 #endif
 
 
 #endif
 

+#if !wxUSE_STL

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


@@ -1998,14 +2238,15 @@ void wxWindowListNode::DeleteData()
 {
     delete (wxWindow *)GetData();
 }
 {
     delete (wxWindow *)GetData();
 }

+#endif

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

-wxBorder wxWindowBase::GetBorder() const
+wxBorder wxWindowBase::GetBorder(long flags) const

 {
 {

-    wxBorder border = (wxBorder)(m_windowStyle & wxBORDER_MASK);
+    wxBorder border = (wxBorder)(flags & wxBORDER_MASK);

     if ( border == wxBORDER_DEFAULT )
     {
         border = GetDefaultBorder();
     if ( border == wxBORDER_DEFAULT )
     {
         border = GetDefaultBorder();


@@ -2088,10 +2329,28 @@ 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
+
+bool
+wxWindowBase::RegisterHotKey(int WXUNUSED(hotkeyId),
+                             int WXUNUSED(modifiers),
+                             int WXUNUSED(keycode))
+{
+    // not implemented
+    return false;
+}
+
+bool wxWindowBase::UnregisterHotKey(int WXUNUSED(hotkeyId))
+{
+    // not implemented
+    return false;
+}
+
+#endif // wxUSE_HOTKEY

 
 void wxWindowBase::SendDestroyEvent()
 {
 
 void wxWindowBase::SendDestroyEvent()
 {


@@ -2105,10 +2364,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 )


@@ -2116,21 +2374,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


@@ -2140,13 +2396,64 @@ 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);

+            }

         }
     }
 
     return wxEvtHandler::TryParent(event);
 }
 
         }
     }
 
     return wxEvtHandler::TryParent(event);
 }
 

+// ----------------------------------------------------------------------------
+// keyboard navigation
+// ----------------------------------------------------------------------------
+
+// Navigates in the specified direction.
+bool wxWindowBase::Navigate(int flags)
+{
+    wxNavigationKeyEvent eventNav;
+    eventNav.SetFlags(flags);
+    eventNav.SetEventObject(this);
+    if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
+    {
+        return true;
+    }
+    return false;
+}
+
+void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+{
+    // check that we're not a top level window
+    wxCHECK_RET( GetParent(),
+                    _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
+
+    // find the target window in the siblings list
+    wxWindowList& siblings = GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator i = siblings.Find(win);
+    wxCHECK_RET( i, _T("MoveBefore/AfterInTabOrder(): win is not a sibling") );
+
+    // unfortunately, when wxUSE_STL == 1 DetachNode() is not implemented so we
+    // can't just move the node around
+    wxWindow *self = (wxWindow *)this;
+    siblings.DeleteObject(self);
+    if ( move == MoveAfter )
+    {
+        i = i->GetNext();
+    }
+
+    if ( i )
+    {
+        siblings.Insert(i, self);
+    }
+    else // MoveAfter and win was the last sibling
+    {
+        siblings.Append(self);
+    }
+}
+

 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------


@@ -2166,7 +2473,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())


@@ -2191,7 +2498,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;


@@ -2209,7 +2516,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())


@@ -2239,7 +2546,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


@@ -2252,12 +2560,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;
             }


@@ -2268,7 +2576,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


@@ -2281,12 +2590,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;
             }


@@ -2307,19 +2616,21 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
 
     wxString title;
 
 
     wxString title;
 

-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual

     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
 
     // This will eventually be replaced by specialised
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
 
     // This will eventually be replaced by specialised

-    // accessible classes, one for each kind of wxWindows
+    // accessible classes, one for each kind of wxWidgets

     // control or window.
     // control or window.

+#if wxUSE_BUTTON

     if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
         title = ((wxButton*) GetWindow())->GetLabel();
     else
     if (GetWindow()->IsKindOf(CLASSINFO(wxButton)))
         title = ((wxButton*) GetWindow())->GetLabel();
     else

+#endif

         title = GetWindow()->GetName();
         title = GetWindow()->GetName();

-    
+

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


@@ -2359,7 +2670,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;


@@ -2394,7 +2705,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())


@@ -2409,7 +2720,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())


@@ -2419,7 +2730,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())


@@ -2435,7 +2746,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())


@@ -2452,7 +2763,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())


@@ -2468,7 +2779,7 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role)
     if (!GetWindow())
         return wxACC_FAIL;
 
     if (!GetWindow())
         return wxACC_FAIL;
 

-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual

     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;


@@ -2488,7 +2799,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.


@@ -2498,7 +2811,7 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state)
     if (!GetWindow())
         return wxACC_FAIL;
 
     if (!GetWindow())
         return wxACC_FAIL;
 

-    // If a child, leave wxWindows to call the function on the actual
+    // If a child, leave wxWidgets to call the function on the actual

     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;
     // child object.
     if (childId > 0)
         return wxACC_NOT_IMPLEMENTED;


@@ -2518,12 +2831,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())


@@ -2533,7 +2848,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())


@@ -2546,7 +2861,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())


@@ -2563,7 +2878,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())