restore SetSelection(-1, -1) behaviour which was broken during wxTextEntry refactoring

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index f044c553cd09dfa311df0ce664c054443fd476ed..477c4d8c9d6473256520cc0b8682fbbf788202c1 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        common/window.cpp
+// Name:        src/common/window.cpp

 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     13/07/98
 // RCS-ID:      $Id$
 // Purpose:     common (to all ports) wxWindow functions
 // Author:      Julian Smart, Vadim Zeitlin
 // Modified by:
 // Created:     13/07/98
 // RCS-ID:      $Id$

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

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


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "windowbase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -33,7 +29,6 @@
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/frame.h"

-    #include "wx/defs.h"

     #include "wx/window.h"
     #include "wx/control.h"
     #include "wx/checkbox.h"
     #include "wx/window.h"
     #include "wx/control.h"
     #include "wx/checkbox.h"


@@ -44,14 +39,13 @@
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/statusbr.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/statusbr.h"

+    #include "wx/toolbar.h"

     #include "wx/dcclient.h"
     #include "wx/dcclient.h"

-#endif //WX_PRECOMP
-
-#if wxUSE_CONSTRAINTS
+    #include "wx/scrolbar.h"

     #include "wx/layout.h"
     #include "wx/layout.h"

-#endif // wxUSE_CONSTRAINTS
-
-#include "wx/sizer.h"
+    #include "wx/sizer.h"
+    #include "wx/menu.h"
+#endif //WX_PRECOMP

 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"
 
 #if wxUSE_DRAG_AND_DROP
     #include "wx/dnd.h"


@@ -73,15 +67,34 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

+#if wxUSE_SYSTEM_OPTIONS
+    #include "wx/sysopt.h"
+#endif
+
+// For reporting compile- and runtime version of GTK+ in the ctrl+alt+mclick dialog.
+// The gtk includes don't pull any other headers in, at least not on my system - MR
+#ifdef __WXGTK__
+    #ifdef __WXGTK20__
+        #include <gtk/gtkversion.h>
+    #else
+        #include <gtk/gtkfeatures.h>
+    #endif
+#endif
+
+#include "wx/platinfo.h"
+
+// Windows List
+WXDLLIMPEXP_DATA_CORE(wxWindowList) wxTopLevelWindows;
+
+// globals
+#if wxUSE_MENUS
+wxMenu *wxCurrentPopupMenu = NULL;
+#endif // wxUSE_MENUS
+

 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // static data
 // ----------------------------------------------------------------------------
 

-#if defined(__WXPM__)
-int wxWindowBase::ms_lastControlId = 2000;
-#else
-int wxWindowBase::ms_lastControlId = -200;
-#endif

 
 IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
 
 
 IMPLEMENT_ABSTRACT_CLASS(wxWindowBase, wxEvtHandler)
 


@@ -95,7 +108,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,21 +122,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_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;


@@ -133,28 +149,21 @@ 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;
 

+    m_backgroundStyle = wxBG_STYLE_SYSTEM;
+

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


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


@@ -178,7 +187,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,13 +196,23 @@ void wxWindowBase::InitBase()
 
     m_virtualSize = wxDefaultSize;
 
 
     m_virtualSize = wxDefaultSize;
 

-    m_minVirtualWidth =
-    m_minVirtualHeight =
-    m_maxVirtualWidth =
-    m_maxVirtualHeight = -1;
+    m_scrollHelper = (wxScrollHelper *) NULL;
+
+    m_windowVariant = wxWINDOW_VARIANT_NORMAL;
+#if wxUSE_SYSTEM_OPTIONS
+    if ( wxSystemOptions::HasOption(wxWINDOW_DEFAULT_VARIANT) )
+    {
+       m_windowVariant = (wxWindowVariant) wxSystemOptions::GetOptionInt( wxWINDOW_DEFAULT_VARIANT ) ;
+    }
+#endif

 
     // 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;
+
+    m_freezeCount = 0;

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


@@ -202,7 +221,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


@@ -218,15 +237,27 @@ 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)
-    wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767),
+    // reserved for wxWidgets own usage)
+    wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767) ||
+                  (id >= wxID_AUTO_LOWEST && id <= wxID_AUTO_HIGHEST),

                   _T("invalid id value") );
 
     // generate a new id if the user doesn't care about it
                   _T("invalid id value") );
 
     // generate a new id if the user doesn't care about it

-    m_windowId = id == wxID_ANY ? NewControlId() : id;
+    if ( id == wxID_ANY )
+    {
+        m_windowId = NewControlId();
+    }
+    else // valid id specified
+    {
+        m_windowId = id;
+    }
+
+    // don't use SetWindowStyleFlag() here, this function should only be called
+    // to change the flag after creation as it tries to reflect the changes in
+    // flags by updating the window dynamically and we don't need this here
+    m_windowStyle = style;

 
     SetName(name);
 
     SetName(name);

-    SetWindowStyleFlag(style);

     SetParent(parent);
 
 #if wxUSE_VALIDATORS
     SetParent(parent);
 
 #if wxUSE_VALIDATORS


@@ -241,7 +272,29 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
         SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
     }
 
         SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
     }
 

-    return TRUE;
+    return true;
+}
+
+bool wxWindowBase::ToggleWindowStyle(int flag)
+{
+    wxASSERT_MSG( flag, _T("flags with 0 value can't be toggled") );
+
+    bool rc;
+    long style = GetWindowStyleFlag();
+    if ( style & flag )
+    {
+        style &= ~flag;
+        rc = false;
+    }
+    else // currently off
+    {
+        style |= flag;
+        rc = true;
+    }
+
+    SetWindowStyleFlag(style);
+
+    return rc;

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


@@ -264,16 +317,23 @@ wxWindowBase::~wxWindowBase()
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject((wxWindow*)this);
 
     // we weren't a dialog class
     wxTopLevelWindows.DeleteObject((wxWindow*)this);
 

+    // The associated popup menu can still be alive, disassociate from it in
+    // this case
+    if ( wxCurrentPopupMenu && wxCurrentPopupMenu->GetInvokingWindow() == this )
+        wxCurrentPopupMenu->SetInvokingWindow(NULL);
+

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

+    // notify the parent about this window destruction
+    if ( m_parent )
+        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


@@ -289,54 +349,48 @@ 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);
-    }
+void wxWindowBase::SendDestroyEvent()
+{
+    wxWindowDestroyEvent event;
+    event.SetEventObject(this);
+    event.SetId(GetId());
+    GetEventHandler()->ProcessEvent(event);

 }
 
 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();
 }
     // close event
     return GetEventHandler()->ProcessEvent(event) && !event.GetVeto();
 }


@@ -353,16 +407,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;

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


@@ -370,126 +425,20 @@ bool wxWindowBase::DestroyChildren()
 // ----------------------------------------------------------------------------
 
 // centre the window with respect to its parent in either (or both) directions
 // ----------------------------------------------------------------------------
 
 // centre the window with respect to its parent in either (or both) directions

-void wxWindowBase::Centre(int direction)
+void wxWindowBase::DoCentre(int dir)

 {
 {

-    // the position/size of the parent window or of the entire screen
-    wxPoint posParent;
-    int widthParent, heightParent;
-
-    wxWindow *parent = NULL;
-
-    if ( !(direction & wxCENTRE_ON_SCREEN) )
-    {
-        // find the parent to centre this window on: it should be the
-        // immediate parent for the controls but the top level parent for the
-        // top level windows (like dialogs)
-        parent = GetParent();
-        if ( IsTopLevel() )
-        {
-            while ( parent && !parent->IsTopLevel() )
-            {
-                parent = parent->GetParent();
-            }
-        }
-
-        // there is no wxTopLevelWindow under wxMotif yet
-#ifndef __WXMOTIF__
-        // we shouldn't center the dialog on the iconized window: under
-        // Windows, for example, this places it completely off the screen
-        if ( parent )
-        {
-            wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
-            if ( winTop && winTop->IsIconized() )
-            {
-                parent = NULL;
-            }
-        }
-#endif // __WXMOTIF__
-
-        // did we find the parent?
-        if ( !parent )
-        {
-            // no other choice
-            direction |= wxCENTRE_ON_SCREEN;
-        }
-    }
-
-    if ( direction & wxCENTRE_ON_SCREEN )
-    {
-        // centre with respect to the whole screen
-        wxDisplaySize(&widthParent, &heightParent);
-    }
-    else
-    {
-        if ( IsTopLevel() )
-        {
-            // centre on the parent
-            parent->GetSize(&widthParent, &heightParent);
-
-            // adjust to the parents position
-            posParent = parent->GetPosition();
-        }
-        else
-        {
-            // centre inside the parents client rectangle
-            parent->GetClientSize(&widthParent, &heightParent);
-        }
-    }
-
-    int width, height;
-    GetSize(&width, &height);
-
-    int xNew = -1,
-        yNew = -1;
-
-    if ( direction & wxHORIZONTAL )
-        xNew = (widthParent - width)/2;
-
-    if ( direction & wxVERTICAL )
-        yNew = (heightParent - height)/2;
+    wxCHECK_RET( !(dir & wxCENTRE_ON_SCREEN) && GetParent(),
+                 _T("this method only implements centering child windows") );

 
 

-    xNew += posParent.x;
-    yNew += posParent.y;
-
-    // Base size of the visible dimensions of the display
-    // to take into account the taskbar
-    wxRect rect = wxGetClientDisplayRect();
-    wxSize size (rect.width,rect.height);
-
-    // NB: in wxMSW, negative position may not neccessary mean "out of screen",
-    //     but it may mean that the window is placed on other than the main
-    //     display. Therefore we only make sure centered window is on the main display
-    //     if the parent is at least partially present here.
-    if (posParent.x + widthParent >= 0)  // if parent is (partially) on the main display
-    {
-        if (xNew < 0)
-            xNew = 0;
-        else if (xNew+width > size.x)
-            xNew = size.x-width-1;
-    }
-    if (posParent.y + heightParent >= 0)  // if parent is (partially) on the main display
-    {
-        if (yNew+height > size.y)
-            yNew = size.y-height-1;
-
-        // Make certain that the title bar is initially visible
-        // always, even if this would push the bottom of the
-        // dialog of the visible area of the display
-        if (yNew < 0)
-            yNew = 0;
-    }
-
-    // move the window to this position (keeping the old size but using
-    // SetSize() and not Move() to allow xNew and/or yNew to be -1)
-    SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
+    SetSize(GetRect().CentreIn(GetParent()->GetClientSize(), dir));

 }
 
 // fits the window around the children
 void wxWindowBase::Fit()
 {
 }
 
 // fits the window around the children
 void wxWindowBase::Fit()
 {

-    if ( GetChildren().GetCount() > 0 )
+    if ( !GetChildren().empty() )

     {
     {

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

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


@@ -503,12 +452,44 @@ 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
+
+void wxWindowBase::InvalidateBestSize()
+{
+    m_bestSizeCache = wxDefaultSize;
+
+    // parent's best size calculation may depend on its children's
+    // as long as child window we are in is not top level window itself
+    // (because the TLW size is never resized automatically)
+    // so let's invalidate it as well to be safe:
+    if (m_parent && !IsTopLevel())
+        m_parent->InvalidateBestSize();
+}
+

 // 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
 {

+    wxSize best;
+

     if ( m_windowSizer )
     {
     if ( m_windowSizer )
     {

-        return m_windowSizer->GetMinSize();
+        best = m_windowSizer->GetMinSize();

     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )
     }
 #if wxUSE_CONSTRAINTS
     else if ( m_constraints )


@@ -544,12 +525,17 @@ wxSize wxWindowBase::DoGetBestSize() const
             //       will never return a size bigger than the current one :-(
         }
 
             //       will never return a size bigger than the current one :-(
         }
 

-        return wxSize(maxX, maxY);
+        best = wxSize(maxX, maxY);

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


@@ -559,8 +545,9 @@ wxSize wxWindowBase::DoGetBestSize() const
         {
             wxWindow *win = node->GetData();
             if ( win->IsTopLevel()
         {
             wxWindow *win = node->GetData();
             if ( win->IsTopLevel()

+                    || !win->IsShown()

 #if wxUSE_STATUSBAR
 #if wxUSE_STATUSBAR

-                    || wxDynamicCast(win, wxStatusBar)
+                        || wxDynamicCast(win, wxStatusBar)

 #endif // wxUSE_STATUSBAR
                )
             {
 #endif // wxUSE_STATUSBAR
                )
             {


@@ -575,9 +562,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);


@@ -587,36 +574,194 @@ wxSize wxWindowBase::DoGetBestSize() const
                 maxY = wy + wh;
         }
 
                 maxY = wy + wh;
         }
 

-        // for compatibility with the old versions and because it really looks
-        // slightly more pretty like this, add a pad
-        maxX += 7;
-        maxY += 14;
+        best = wxSize(maxX, maxY);
+    }
+    else // ! has children
+    {
+        // for a generic window there is no natural best size so, if the
+        // minimal size is not set, use the current size but take care to
+        // remember it as minimal size for the next time because our best size
+        // should be constant: otherwise we could get into a situation when the
+        // window is initially at some size, then expanded to a larger size and
+        // then, when the containing window is shrunk back (because our initial
+        // best size had been used for computing the parent min size), we can't
+        // be shrunk back any more because our best size is now bigger
+        wxSize size = GetMinSize();
+        if ( !size.IsFullySpecified() )
+        {
+            size.SetDefaults(GetSize());
+            wxConstCast(this, wxWindowBase)->SetMinSize(size);
+        }

 
 

-        return wxSize(maxX, maxY);
+        // return as-is, unadjusted by the client size difference.
+        return size;

     }
     }

-    else
+
+    // Add any difference between size and client size
+    wxSize diff = GetSize() - GetClientSize();
+    best.x += wxMax(0, diff.x);
+    best.y += wxMax(0, diff.y);
+
+    return best;
+}
+
+// helper of GetWindowBorderSize(): as many ports don't implement support for
+// wxSYS_BORDER/EDGE_X/Y metrics in their wxSystemSettings, use hard coded
+// fallbacks in this case
+static int wxGetMetricOrDefault(wxSystemMetric what)
+{
+    int rc = wxSystemSettings::GetMetric(what);
+    if ( rc == -1 )

     {
     {

-        // for a generic window there is no natural best size - just use the
-        // current one
-        return GetSize();
+        switch ( what )
+        {
+            case wxSYS_BORDER_X:
+            case wxSYS_BORDER_Y:
+                // 2D border is by default 1 pixel wide
+                rc = 1;
+                break;
+
+            case wxSYS_EDGE_X:
+            case wxSYS_EDGE_Y:
+                // 3D borders are by default 2 pixels
+                rc = 2;
+                break;
+
+            default:
+                wxFAIL_MSG( _T("unexpected wxGetMetricOrDefault() argument") );
+                rc = 0;
+        }

     }
     }

+
+    return rc;

 }
 
 }
 

+wxSize wxWindowBase::GetWindowBorderSize() const
+{
+    wxSize size;
+
+    switch ( GetBorder() )
+    {
+        case wxBORDER_NONE:
+            // nothing to do, size is already (0, 0)
+            break;
+
+        case wxBORDER_SIMPLE:
+        case wxBORDER_STATIC:
+            size.x = wxGetMetricOrDefault(wxSYS_BORDER_X);
+            size.y = wxGetMetricOrDefault(wxSYS_BORDER_Y);
+            break;
+
+        case wxBORDER_SUNKEN:
+        case wxBORDER_RAISED:
+            size.x = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_X),
+                           wxGetMetricOrDefault(wxSYS_BORDER_X));
+            size.y = wxMax(wxGetMetricOrDefault(wxSYS_EDGE_Y),
+                           wxGetMetricOrDefault(wxSYS_BORDER_Y));
+            break;
+
+        case wxBORDER_DOUBLE:
+            size.x = wxGetMetricOrDefault(wxSYS_EDGE_X) +
+                        wxGetMetricOrDefault(wxSYS_BORDER_X);
+            size.y = wxGetMetricOrDefault(wxSYS_EDGE_Y) +
+                        wxGetMetricOrDefault(wxSYS_BORDER_Y);
+            break;
+
+        default:
+            wxFAIL_MSG(_T("Unknown border style."));
+            break;
+    }
+
+    // we have borders on both sides
+    return size*2;
+}
+
+wxSize wxWindowBase::GetEffectiveMinSize() 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::SetInitialSize(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 = GetEffectiveMinSize();
+
+    // 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
 {

-    return wxPoint(0, 0);
+    return wxPoint(0,0);
+}
+
+void wxWindowBase::SetWindowVariant( wxWindowVariant variant )
+{
+    if ( m_windowVariant != variant )
+    {
+        m_windowVariant = variant;
+
+        DoSetWindowVariant(variant);
+    }

 }
 
 }
 

-// set the min/max size of the window
-void wxWindowBase::SetSizeHints(int minW, int minH,
-                                int maxW, int maxH,
-                                int WXUNUSED(incW), int WXUNUSED(incH))
+void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant )

 {
 {

-    // 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),
+    // 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::DoSetSizeHints( int minW, int minH,
+                                   int maxW, int maxH,
+                                   int WXUNUSED(incW), int WXUNUSED(incH) )
+{
+    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;


@@ -625,35 +770,49 @@ void wxWindowBase::SetSizeHints(int minW, int minH,
     m_maxHeight = maxH;
 }
 
     m_maxHeight = maxH;
 }
 

-void wxWindowBase::SetVirtualSizeHints( int minW, int minH,
-                                        int maxW, int maxH )
+
+#if WXWIN_COMPATIBILITY_2_8
+void wxWindowBase::SetVirtualSizeHints(int WXUNUSED(minW), int WXUNUSED(minH),
+                                       int WXUNUSED(maxW), int WXUNUSED(maxH))

 {
 {

-    m_minVirtualWidth = minW;
-    m_maxVirtualWidth = maxW;
-    m_minVirtualHeight = minH;
-    m_maxVirtualHeight = maxH;

 }
 
 }
 

-void wxWindowBase::DoSetVirtualSize( int x, int y )
+void wxWindowBase::SetVirtualSizeHints(const wxSize& WXUNUSED(minsize),
+                                       const wxSize& WXUNUSED(maxsize))

 {
 {

-    if ( m_minVirtualWidth != -1 && m_minVirtualWidth > x )
-        x = m_minVirtualWidth;
-    if ( m_maxVirtualWidth != -1 && m_maxVirtualWidth < x )
-        x = m_maxVirtualWidth;
-    if ( m_minVirtualHeight != -1 && m_minVirtualHeight > y )
-        y = m_minVirtualHeight;
-    if ( m_maxVirtualHeight != -1 && m_maxVirtualHeight < y )
-        y = m_maxVirtualHeight;
+}
+#endif // WXWIN_COMPATIBILITY_2_8

 
 

+void wxWindowBase::DoSetVirtualSize( int x, int y )
+{

     m_virtualSize = wxSize(x, y);
 }
 
 wxSize wxWindowBase::DoGetVirtualSize() const
 {
     m_virtualSize = wxSize(x, y);
 }
 
 wxSize wxWindowBase::DoGetVirtualSize() const
 {

-    wxSize  s( GetClientSize() );
+    // we should use the entire client area so if it is greater than our
+    // virtual size, expand it to fit (otherwise if the window is big enough we
+    // wouldn't be using parts of it)
+    wxSize size = GetClientSize();
+    if ( m_virtualSize.x > size.x )
+        size.x = m_virtualSize.x;
+
+    if ( m_virtualSize.y >= size.y )
+        size.y = m_virtualSize.y;

 
 

-    return wxSize( wxMax( m_virtualSize.GetWidth(), s.GetWidth() ),
-                   wxMax( m_virtualSize.GetHeight(), s.GetHeight() ) );
+    return size;
+}
+
+void wxWindowBase::DoGetScreenPosition(int *x, int *y) const
+{
+    // screen position is the same as (0, 0) in client coords for non TLWs (and
+    // TLWs override this method)
+    if ( x )
+        *x = 0;
+    if ( y )
+        *y = 0;
+
+    ClientToScreen(x, y);

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


@@ -666,34 +825,81 @@ bool wxWindowBase::Show(bool show)
     {
         m_isShown = show;
 
     {
         m_isShown = show;
 

-        return TRUE;
+        return true;

     }
     else
     {
     }
     else
     {

-        return FALSE;
+        return false;

     }
 }
 
     }
 }
 

-bool wxWindowBase::Enable(bool enable)
+bool wxWindowBase::IsEnabled() const

 {
 {

-    if ( enable != m_isEnabled )
-    {
-        m_isEnabled = enable;
+    return IsThisEnabled() && (IsTopLevel() || !GetParent() || GetParent()->IsEnabled());
+}
+
+void wxWindowBase::NotifyWindowOnEnableChange(bool enabled)
+{
+#ifndef wxHAS_NATIVE_ENABLED_MANAGEMENT
+    DoEnable(enabled);
+#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
+
+    OnEnabled(enabled);
+
+    // If we are top-level then the logic doesn't apply - otherwise
+    // showing a modal dialog would result in total greying out (and ungreying
+    // out later) of everything which would be really ugly
+    if ( IsTopLevel() )
+        return;

 
 

-        return TRUE;
+    for ( wxWindowList::compatibility_iterator node = GetChildren().GetFirst();
+          node;
+          node = node->GetNext() )
+    {
+        wxWindowBase * const child = node->GetData();
+        if ( !child->IsTopLevel() && child->IsThisEnabled() )
+            child->NotifyWindowOnEnableChange(enabled);

     }
     }

-    else
+}
+
+bool wxWindowBase::Enable(bool enable)
+{
+    if ( enable == IsThisEnabled() )
+        return false;
+
+    m_isEnabled = enable;
+
+#ifdef wxHAS_NATIVE_ENABLED_MANAGEMENT
+    DoEnable(enable);
+#else // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
+    wxWindowBase * const parent = GetParent();
+    if( !IsTopLevel() && parent && !parent->IsEnabled() )

     {
     {

-        return FALSE;
+        return true;

     }
     }

+#endif // !defined(wxHAS_NATIVE_ENABLED_MANAGEMENT)
+
+    NotifyWindowOnEnableChange(enable);
+
+    return true;
+}
+
+bool wxWindowBase::IsShownOnScreen() const
+{
+    // A window is shown on screen if it itself is shown and so are all its
+    // parents. But if a window is toplevel one, then its always visible on
+    // screen if IsShown() returns true, even if it has a hidden parent.
+    return IsShown() &&
+           (IsTopLevel() || GetParent() == NULL || GetParent()->IsShownOnScreen());

 }
 }

+

 // ----------------------------------------------------------------------------
 // RTTI
 // ----------------------------------------------------------------------------
 
 bool wxWindowBase::IsTopLevel() const
 {
 // ----------------------------------------------------------------------------
 // RTTI
 // ----------------------------------------------------------------------------
 
 bool wxWindowBase::IsTopLevel() const
 {

-    return FALSE;
+    return false;

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


@@ -727,9 +933,11 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
     if ( newParent == oldParent )
     {
         // nothing done
     if ( newParent == oldParent )
     {
         // nothing done

-        return FALSE;
+        return false;

     }
 
     }
 

+    const bool oldEnabledState = IsEnabled();
+

     // unlink this window from the existing parent.
     if ( oldParent )
     {
     // unlink this window from the existing parent.
     if ( oldParent )
     {


@@ -750,7 +958,15 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent)
         wxTopLevelWindows.Append((wxWindow *)this);
     }
 
         wxTopLevelWindows.Append((wxWindow *)this);
     }
 

-    return TRUE;
+    // We need to notify window (and its subwindows) if by changing the parent
+    // we also change our enabled/disabled status.
+    const bool newEnabledState = IsEnabled();
+    if ( newEnabledState != oldEnabledState )
+    {
+        NotifyWindowOnEnableChange(newEnabledState);
+    }
+
+    return true;

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


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


@@ -816,9 +1032,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;


@@ -827,75 +1045,192 @@ 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;
+}
+
+bool wxWindowBase::HandleWindowEvent(wxEvent& event) const
+{
+    return GetEventHandler()->SafelyProcessEvent(event);

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

-// 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;
+        // inheriting (solid) background colour is wrong as it totally breaks
+        // any kind of themed backgrounds
+        //
+        // instead, the controls should use the same background as their parent
+        // (ideally by not drawing it at all)
+#if 0
+        if ( parent->m_inheritBgCol && !m_hasBgCol )
+            SetBackgroundColour(parent->GetBackgroundColour());
+#endif // 0
+    }

 }
 
 }
 

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

 
 

-    m_foregroundColour = colour;
+    // On Smartphone/PocketPC, wxSYS_COLOUR_WINDOW is a better reflection of
+    // the usual background colour than wxSYS_COLOUR_BTNFACE.
+    // It's a pity that wxSYS_COLOUR_WINDOW isn't always a suitable background
+    // colour on other platforms.
+
+#if defined(__WXWINCE__) && (defined(__SMARTPHONE__) || defined(__POCKETPC__))
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW);
+#else
+    attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+#endif
+    return attrs;
+}
+
+wxColour wxWindowBase::GetBackgroundColour() const
+{
+    if ( !m_backgroundColour.IsOk() )
+    {
+        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() )
+    {
+        wxColour colFg = GetDefaultAttributes().colFg;

 
 

-    m_hasFgCol = TRUE;
+        if ( !colFg.IsOk() )
+            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.IsOk();
+    if ( m_backgroundStyle != wxBG_STYLE_CUSTOM )
+        m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM;
+
+    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.IsOk();
+    m_inheritFgCol = m_hasFgCol;
+    m_foregroundColour = colour;
+    SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
+    return true;

 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // cursor
 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     // setting an invalid cursor is ok, it means that we don't have any special
     // cursor

-    if ( m_cursor == cursor )
+    if ( m_cursor.IsSameAs(cursor) )

     {
         // no change
     {
         // 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.IsOk() )
+    {
+        wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );

 
 

-    if ( fontOk == m_font )
+        wxFont font = GetDefaultAttributes().font;
+        if ( !font.IsOk() )
+            font = GetClassDefaultAttributes().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.IsOk();
+    m_inheritFont = m_hasFont;

 
 

-    m_hasFont = TRUE;
+    InvalidateBestSize();

 
 

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


@@ -947,7 +1282,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
 


@@ -967,21 +1302,32 @@ wxRect wxWindowBase::GetUpdateClientRect() const
     return rectUpdate;
 }
 
     return rectUpdate;
 }
 

-bool wxWindowBase::IsExposed(int x, int y) const
+bool wxWindowBase::DoIsExposed(int x, int y) const

 {
     return m_updateRegion.Contains(x, y) != wxOutRegion;
 }
 
 {
     return m_updateRegion.Contains(x, y) != wxOutRegion;
 }
 

-bool wxWindowBase::IsExposed(int x, int y, int w, int h) const
+bool wxWindowBase::DoIsExposed(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
 // ----------------------------------------------------------------------------
 

-wxWindow *wxWindowBase::FindWindow( long id )
+wxWindow *wxWindowBase::FindWindow(long id) const

 {
     if ( id == m_windowId )
         return (wxWindow *)this;
 {
     if ( id == m_windowId )
         return (wxWindow *)this;


@@ -997,7 +1343,7 @@ wxWindow *wxWindowBase::FindWindow( long id )
     return (wxWindow *)res;
 }
 
     return (wxWindow *)res;
 }
 

-wxWindow *wxWindowBase::FindWindow( const wxString& name )
+wxWindow *wxWindowBase::FindWindow(const wxString& name) const

 {
     if ( name == m_windowName )
         return (wxWindow *)this;
 {
     if ( name == m_windowName )
         return (wxWindow *)this;


@@ -1129,7 +1475,7 @@ wxWindowBase::FindWindowByName(const wxString& title, const wxWindow *parent)
 wxWindow *
 wxWindowBase::FindWindowById( long id, const wxWindow* parent )
 {
 wxWindow *
 wxWindowBase::FindWindowById( long id, const wxWindow* parent )
 {

-    return wxFindWindowHelper(parent, _T(""), id, wxFindWindowCmpIds);
+    return wxFindWindowHelper(parent, wxEmptyString, id, wxFindWindowCmpIds);

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


@@ -1165,17 +1511,17 @@ bool wxWindowBase::Validate()
         wxValidator *validator = child->GetValidator();
         if ( validator && !validator->Validate((wxWindow *)this) )
         {
         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()


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

-            return FALSE;
+            return false;

         }
 
         if ( recurse )
         }
 
         if ( recurse )


@@ -1203,13 +1549,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 +1573,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 )


@@ -1235,13 +1581,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()


@@ -1279,7 +1625,10 @@ void wxWindowBase::SetHelpTextForId(const wxString& text)
 }
 
 // get the help string associated with this window (may be empty)
 }
 
 // get the help string associated with this window (may be empty)

-wxString wxWindowBase::GetHelpText() const
+// default implementation forwards calls to the help provider
+wxString
+wxWindowBase::GetHelpTextAtPoint(const wxPoint & WXUNUSED(pt),
+                                 wxHelpEvent::Origin WXUNUSED(origin)) const

 {
     wxString text;
     wxHelpProvider *helpProvider = wxHelpProvider::Get();
 {
     wxString text;
     wxHelpProvider *helpProvider = wxHelpProvider::Get();


@@ -1297,7 +1646,7 @@ void wxWindowBase::OnHelp(wxHelpEvent& event)
     wxHelpProvider *helpProvider = wxHelpProvider::Get();
     if ( helpProvider )
     {
     wxHelpProvider *helpProvider = wxHelpProvider::Get();
     if ( helpProvider )
     {

-        if ( helpProvider->ShowHelp(this) )
+        if ( helpProvider->ShowHelpAtPoint(this, event.GetPosition(), event.GetOrigin()) )

         {
             // skip the event.Skip() below
             return;
         {
             // skip the event.Skip() below
             return;


@@ -1310,7 +1659,7 @@ void wxWindowBase::OnHelp(wxHelpEvent& event)
 #endif // wxUSE_HELP
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_HELP
 
 // ----------------------------------------------------------------------------

-// tooltipsroot.Replace("\\", "/");
+// tooltips

 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLTIPS
 // ----------------------------------------------------------------------------
 
 #if wxUSE_TOOLTIPS


@@ -1333,10 +1682,13 @@ void wxWindowBase::SetToolTip( const wxString &tip )
 
 void wxWindowBase::DoSetToolTip(wxToolTip *tooltip)
 {
 
 void wxWindowBase::DoSetToolTip(wxToolTip *tooltip)
 {

-    if ( m_tooltip )
-        delete m_tooltip;
+    if ( m_tooltip != tooltip )
+    {
+        if ( m_tooltip )
+            delete m_tooltip;

 
 

-    m_tooltip = tooltip;
+        m_tooltip = tooltip;
+    }

 }
 
 #endif // wxUSE_TOOLTIPS
 }
 
 #endif // wxUSE_TOOLTIPS


@@ -1457,12 +1809,24 @@ void wxWindowBase::DeleteRelatedConstraints()
 
 void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
 {
 
 void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld)
 {

-    if ( deleteOld )
-        delete m_windowSizer;
+    if ( sizer == m_windowSizer)
+        return;
+
+    if ( m_windowSizer )
+    {
+        m_windowSizer->SetContainingWindow(NULL);
+
+        if ( deleteOld )
+            delete m_windowSizer;
+    }

 
     m_windowSizer = sizer;
 
     m_windowSizer = sizer;

+    if ( m_windowSizer )
+    {
+        m_windowSizer->SetContainingWindow((wxWindow *)this);
+    }

 
 

-    SetAutoLayout( sizer != NULL );
+    SetAutoLayout(m_windowSizer != NULL);

 }
 
 void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)
 }
 
 void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld)


@@ -1471,6 +1835,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()


@@ -1503,7 +1880,7 @@ bool wxWindowBase::Layout()
     // If there is a sizer, use it instead of the constraints
     if ( GetSizer() )
     {
     // If there is a sizer, use it instead of the constraints
     if ( GetSizer() )
     {

-        int w, h;
+        int w = 0, h = 0;

         GetVirtualSize(&w, &h);
         GetSizer()->SetDimension( 0, 0, w, h );
     }
         GetVirtualSize(&w, &h);
         GetSizer()->SetDimension( 0, 0, w, h );
     }


@@ -1515,7 +1892,7 @@ bool wxWindowBase::Layout()
     }
 #endif
 
     }
 #endif
 

-    return TRUE;
+    return true;

 }
 
 #if wxUSE_CONSTRAINTS
 }
 
 #if wxUSE_CONSTRAINTS


@@ -1539,7 +1916,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


@@ -1593,7 +1970,7 @@ bool wxWindowBase::DoPhase(int phase)
         }
     }
 
         }
     }
 

-    return TRUE;
+    return true;

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


@@ -1601,14 +1978,14 @@ 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::compatibility_iterator node = GetChildren().GetFirst();
     }
 
     wxWindowList::compatibility_iterator node = GetChildren().GetFirst();


@@ -1670,25 +2047,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);

         }
     }
 }
         }
     }
 }


@@ -1698,15 +2075,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);

         }
     }
 }
         }
     }
 }


@@ -1766,13 +2143,13 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co
 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------

-// do Update UI processing for child controls
+// Update UI processing

 // ----------------------------------------------------------------------------
 
 void wxWindowBase::UpdateWindowUI(long flags)
 {
     wxUpdateUIEvent event(GetId());
 // ----------------------------------------------------------------------------
 
 void wxWindowBase::UpdateWindowUI(long flags)
 {
     wxUpdateUIEvent event(GetId());

-    event.m_eventObject = this;
+    event.SetEventObject(this);

 
     if ( GetEventHandler()->ProcessEvent(event) )
     {
 
     if ( GetEventHandler()->ProcessEvent(event) )
     {


@@ -1792,61 +2169,15 @@ void wxWindowBase::UpdateWindowUI(long flags)
 }
 
 // do the window-specific processing after processing the update event
 }
 
 // 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());
 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 ( event.GetSetChecked() )
-                checkbox->SetValue(event.GetChecked());
-        }
-#endif // wxUSE_CHECKBOX

 
 

-#if wxUSE_RADIOBTN
-        wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
-        if ( radiobtn )
-        {
-            if ( event.GetSetChecked() )
-                radiobtn->SetValue(event.GetChecked());
-        }
-#endif // wxUSE_RADIOBTN
-    }    
-#endif
+    if ( event.GetSetShown() )
+        Show(event.GetShown());

 }
 
 }
 

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


@@ -1855,11 +2186,11 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt)
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();

-    wxPoint pt2(-1, -1);
-    if (pt.x != -1)
-        pt2.x = (int) ((pt.x * 4) / charWidth) ;
-    if (pt.y != -1)
-        pt2.y = (int) ((pt.y * 8) / charHeight) ;
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)
+        pt2.x = (int) ((pt.x * 4) / charWidth);
+    if (pt.y != wxDefaultCoord)
+        pt2.y = (int) ((pt.y * 8) / charHeight);

 
     return pt2;
 }
 
     return pt2;
 }


@@ -1868,11 +2199,11 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();
 {
     int charWidth = GetCharWidth();
     int charHeight = GetCharHeight();

-    wxPoint pt2(-1, -1);
-    if (pt.x != -1)
-        pt2.x = (int) ((pt.x * charWidth) / 4) ;
-    if (pt.y != -1)
-        pt2.y = (int) ((pt.y * charHeight) / 8) ;
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)
+        pt2.x = (int) ((pt.x * charWidth) / 4);
+    if (pt.y != wxDefaultCoord)
+        pt2.y = (int) ((pt.y * charHeight) / 8);

 
     return pt2;
 }
 
     return pt2;
 }


@@ -1892,12 +2223,14 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event)
         if ( !win->IsTopLevel() )
         {
             wxSysColourChangedEvent event2;
         if ( !win->IsTopLevel() )
         {
             wxSysColourChangedEvent event2;

-            event.m_eventObject = win;
+            event.SetEventObject(win);

             win->GetEventHandler()->ProcessEvent(event2);
         }
 
         node = node->GetNext();
     }
             win->GetEventHandler()->ProcessEvent(event2);
         }
 
         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,


@@ -1906,71 +2239,140 @@ 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);
 }
 

-// process Ctrl-Alt-mclick
-void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+// ----------------------------------------------------------------------------
+// menu-related functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_MENUS
+
+bool wxWindowBase::PopupMenu(wxMenu *menu, int x, int y)

 {
 {

-#if wxUSE_MSGDLG
-    if ( event.ControlDown() && event.AltDown() )
-    {
-        // don't translate these strings
-        wxString port;
+    wxCHECK_MSG( menu, false, "can't popup NULL menu" );
+
+    wxCurrentPopupMenu = menu;
+    const bool rc = DoPopupMenu(menu, x, y);
+    wxCurrentPopupMenu = NULL;
+
+    return rc;
+}
+
+// this is used to pass the id of the selected item from the menu event handler
+// to the main function itself
+//
+// it's ok to use a global here as there can be at most one popup menu shown at
+// any time
+static int gs_popupMenuSelection = wxID_NONE;
+
+void wxWindowBase::InternalOnPopupMenu(wxCommandEvent& event)
+{
+    // store the id in a global variable where we'll retrieve it from later
+    gs_popupMenuSelection = event.GetId();
+}
+
+int
+wxWindowBase::DoGetPopupMenuSelectionFromUser(wxMenu& menu, int x, int y)
+{
+    gs_popupMenuSelection = wxID_NONE;
+
+    Connect(wxEVT_COMMAND_MENU_SELECTED,
+            wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
+            NULL,
+            this);
+
+    PopupMenu(&menu, x, y);
+
+    Disconnect(wxEVT_COMMAND_MENU_SELECTED,
+               wxCommandEventHandler(wxWindowBase::InternalOnPopupMenu),
+               NULL,
+               this);

 
 

-#ifdef __WXUNIVERSAL__
-        port = _T("Univ/");
-#endif // __WXUNIVERSAL__
+    return gs_popupMenuSelection;
+}
+
+#endif // wxUSE_MENUS
+
+// methods for drawing the sizers in a visible way
+#ifdef __WXDEBUG__
+
+static void DrawSizers(wxWindowBase *win);
+
+static void DrawBorder(wxWindowBase *win, const wxRect& rect, bool fill = false)
+{
+    wxClientDC dc((wxWindow *)win);
+    dc.SetPen(*wxRED_PEN);
+    dc.SetBrush(fill ? wxBrush(*wxRED, wxCROSSDIAG_HATCH): *wxTRANSPARENT_BRUSH);
+    dc.DrawRectangle(rect.Deflate(1, 1));
+}
+
+static void DrawSizer(wxWindowBase *win, wxSizer *sizer)
+{
+    const wxSizerItemList& items = sizer->GetChildren();
+    for ( wxSizerItemList::const_iterator i = items.begin(),
+                                        end = items.end();
+          i != end;
+          ++i )
+    {
+        wxSizerItem *item = *i;
+        if ( item->IsSizer() )
+        {
+            DrawBorder(win, item->GetRect().Deflate(2));
+            DrawSizer(win, item->GetSizer());
+        }
+        else if ( item->IsSpacer() )
+        {
+            DrawBorder(win, item->GetRect().Deflate(2), true);
+        }
+        else if ( item->IsWindow() )
+        {
+            DrawSizers(item->GetWindow());
+        }
+    }
+}

 
 

-        switch ( wxGetOsVersion() )
+static void DrawSizers(wxWindowBase *win)
+{
+    wxSizer *sizer = win->GetSizer();
+    if ( sizer )
+    {
+        DrawBorder(win, win->GetClientSize());
+        DrawSizer(win, sizer);
+    }
+    else // no sizer, still recurse into the children
+    {
+        const wxWindowList& children = win->GetChildren();
+        for ( wxWindowList::const_iterator i = children.begin(),
+                                         end = children.end();
+              i != end;
+              ++i )

         {
         {

-            case wxMOTIF_X:     port += _T("Motif"); break;
-            case wxMAC:
-            case wxMAC_DARWIN:  port += _T("Mac"); break;
-            case wxBEOS:        port += _T("BeOS"); break;
-            case wxGTK:
-            case wxGTK_WIN32:
-            case wxGTK_OS2:
-            case wxGTK_BEOS:    port += _T("GTK"); break;
-            case wxWINDOWS:
-            case wxPENWINDOWS:
-            case wxWINDOWS_NT:
-            case wxWIN32S:
-            case wxWIN95:
-            case wxWIN386:      port += _T("MS Windows"); break;
-            case wxMGL_UNIX:
-            case wxMGL_X:
-            case wxMGL_WIN32:
-            case wxMGL_OS2:     port += _T("MGL"); break;
-            case wxWINDOWS_OS2:
-            case wxOS2_PM:      port += _T("OS/2"); break;
-            default:            port += _T("unknown"); break;
+            DrawSizers(*i);

         }
         }

+    }
+}

 
 

-        wxMessageBox(wxString::Format(
-                                      _T(
-                                        "       wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n   Copyright (c) 1995-2002 wxWindows team"
-                                        ),
-                                      port.c_str(),
-                                      wxMAJOR_VERSION,
-                                      wxMINOR_VERSION,
-                                      wxRELEASE_NUMBER,
-#if wxUSE_UNICODE
-                                      L" (Unicode)",
-#else
-                                      "",
-#endif
-                                      __TDATE__,
-                                      __TTIME__
-                                     ),
-                     _T("wxWindows information"),
-                     wxICON_INFORMATION | wxOK,
-                     (wxWindow *)this);
+#endif // __WXDEBUG__
+
+// process special middle clicks
+void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
+{
+    if ( event.ControlDown() && event.AltDown() )
+    {
+#ifdef __WXDEBUG__
+        // Ctrl-Alt-Shift-mclick makes the sizers visible in debug builds
+        if ( event.ShiftDown() )
+        {
+            DrawSizers(this);
+            return;
+        }
+#endif // __WXDEBUG__
+        ::wxInfoMessageBox((wxWindow*)this);

     }
     else
     }
     else

-#endif // wxUSE_MSGDLG

     {
         event.Skip();
     }
     {
         event.Skip();
     }


@@ -2006,16 +2408,23 @@ wxAccessible* wxWindowBase::CreateAccessible()
 
 #endif
 
 
 #endif
 

-#if !wxUSE_STL

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

+#if wxUSE_STL
+
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxWindowList)
+
+#else // !wxUSE_STL
+

 void wxWindowListNode::DeleteData()
 {
     delete (wxWindow *)GetData();
 }
 void wxWindowListNode::DeleteData()
 {
     delete (wxWindow *)GetData();
 }

-#endif
+
+#endif // wxUSE_STL/!wxUSE_STL

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


@@ -2028,6 +2437,10 @@ wxBorder wxWindowBase::GetBorder(long flags) const
     {
         border = GetDefaultBorder();
     }
     {
         border = GetDefaultBorder();
     }

+    else if ( border == wxBORDER_THEME )
+    {
+        border = GetDefaultBorderForControl();
+    }

 
     return border;
 }
 
     return border;
 }


@@ -2066,10 +2479,16 @@ struct WXDLLEXPORT wxWindowNext
     wxWindow *win;
     wxWindowNext *next;
 } *wxWindowBase::ms_winCaptureNext = NULL;
     wxWindow *win;
     wxWindowNext *next;
 } *wxWindowBase::ms_winCaptureNext = NULL;

+wxWindow *wxWindowBase::ms_winCaptureCurrent = NULL;
+bool wxWindowBase::ms_winCaptureChanging = false;

 
 void wxWindowBase::CaptureMouse()
 {
 
 void wxWindowBase::CaptureMouse()
 {

-    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), this);
+    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(%p)"), wx_static_cast(void*, this));
+
+    wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive CaptureMouse call?") );
+
+    ms_winCaptureChanging = true;

 
     wxWindow *winOld = GetCapture();
     if ( winOld )
 
     wxWindow *winOld = GetCapture();
     if ( winOld )


@@ -2085,19 +2504,28 @@ void wxWindowBase::CaptureMouse()
     //else: no mouse capture to save
 
     DoCaptureMouse();
     //else: no mouse capture to save
 
     DoCaptureMouse();

+    ms_winCaptureCurrent = (wxWindow*)this;
+
+    ms_winCaptureChanging = false;

 }
 
 void wxWindowBase::ReleaseMouse()
 {
 }
 
 void wxWindowBase::ReleaseMouse()
 {

-    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), this);
+    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(%p)"), wx_static_cast(void*, this));
+
+    wxASSERT_MSG( !ms_winCaptureChanging, _T("recursive ReleaseMouse call?") );

 
     wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
 
 
     wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") );
 

+    ms_winCaptureChanging = true;
+

     DoReleaseMouse();
     DoReleaseMouse();

+    ms_winCaptureCurrent = NULL;

 
     if ( ms_winCaptureNext )
     {
         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();
 
     if ( ms_winCaptureNext )
     {
         ((wxWindowBase*)ms_winCaptureNext->win)->DoCaptureMouse();

+        ms_winCaptureCurrent = ms_winCaptureNext->win;

 
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;
 
         wxWindowNext *item = ms_winCaptureNext;
         ms_winCaptureNext = item->next;


@@ -2105,9 +2533,53 @@ void wxWindowBase::ReleaseMouse()
     }
     //else: stack is empty, no previous capture
 
     }
     //else: stack is empty, no previous capture
 

+    ms_winCaptureChanging = false;
+

     wxLogTrace(_T("mousecapture"),
     wxLogTrace(_T("mousecapture"),

-               _T("After ReleaseMouse() mouse is captured by %p"),
-               GetCapture());
+        (const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"),
+        wx_static_cast(void*, GetCapture()));
+}
+
+static void DoNotifyWindowAboutCaptureLost(wxWindow *win)
+{
+    wxMouseCaptureLostEvent event(win->GetId());
+    event.SetEventObject(win);
+    if ( !win->GetEventHandler()->ProcessEvent(event) )
+    {
+        // windows must handle this event, otherwise the app wouldn't behave
+        // correctly if it loses capture unexpectedly; see the discussion here:
+        // http://sourceforge.net/tracker/index.php?func=detail&aid=1153662&group_id=9863&atid=109863
+        // http://article.gmane.org/gmane.comp.lib.wxwidgets.devel/82376
+        wxFAIL_MSG( _T("window that captured the mouse didn't process wxEVT_MOUSE_CAPTURE_LOST") );
+    }
+}
+
+/* static */
+void wxWindowBase::NotifyCaptureLost()
+{
+    // don't do anything if capture lost was expected, i.e. resulted from
+    // a wx call to ReleaseMouse or CaptureMouse:
+    if ( ms_winCaptureChanging )
+        return;
+
+    // if the capture was lost unexpectedly, notify every window that has
+    // capture (on stack or current) about it and clear the stack:
+
+    if ( ms_winCaptureCurrent )
+    {
+        DoNotifyWindowAboutCaptureLost(ms_winCaptureCurrent);
+        ms_winCaptureCurrent = NULL;
+    }
+
+    while ( ms_winCaptureNext )
+    {
+        wxWindowNext *item = ms_winCaptureNext;
+        ms_winCaptureNext = item->next;
+
+        DoNotifyWindowAboutCaptureLost(item->win);
+
+        delete item;
+    }

 }
 
 #if wxUSE_HOTKEY
 }
 
 #if wxUSE_HOTKEY


@@ -2129,22 +2601,13 @@ bool wxWindowBase::UnregisterHotKey(int WXUNUSED(hotkeyId))
 
 #endif // wxUSE_HOTKEY
 
 
 #endif // wxUSE_HOTKEY
 

-void wxWindowBase::SendDestroyEvent()
-{
-    wxWindowDestroyEvent event;
-    event.SetEventObject(this);
-    event.SetId(GetId());
-    GetEventHandler()->ProcessEvent(event);
-}
-

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


@@ -2152,18 +2615,17 @@ 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 if the propgation count hasn't
+    // carry on up the parent-child hierarchy if the propagation count hasn't

     // reached zero yet
     if ( event.ShouldPropagate() )
     {
     // reached zero yet
     if ( event.ShouldPropagate() )
     {


@@ -2186,6 +2648,91 @@ bool wxWindowBase::TryParent(wxEvent& event)
     return wxEvtHandler::TryParent(event);
 }
 
     return wxEvtHandler::TryParent(event);
 }
 

+// ----------------------------------------------------------------------------
+// window relationships
+// ----------------------------------------------------------------------------
+
+wxWindow *wxWindowBase::DoGetSibling(WindowOrder order) const
+{
+    wxCHECK_MSG( GetParent(), NULL,
+                    _T("GetPrev/NextSibling() don't work for TLWs!") );
+
+    wxWindowList& siblings = GetParent()->GetChildren();
+    wxWindowList::compatibility_iterator i = siblings.Find((wxWindow *)this);
+    wxCHECK_MSG( i, NULL, _T("window not a child of its parent?") );
+
+    if ( order == OrderBefore )
+        i = i->GetPrevious();
+    else // OrderAfter
+        i = i->GetNext();
+
+    return i ? i->GetData() : NULL;
+}
+
+// ----------------------------------------------------------------------------
+// keyboard navigation
+// ----------------------------------------------------------------------------
+
+// Navigates in the specified direction inside this window
+bool wxWindowBase::DoNavigateIn(int flags)
+{
+#ifdef wxHAS_NATIVE_TAB_TRAVERSAL
+    // native code doesn't process our wxNavigationKeyEvents anyhow
+    wxUnusedVar(flags);
+    return false;
+#else // !wxHAS_NATIVE_TAB_TRAVERSAL
+    wxNavigationKeyEvent eventNav;
+    eventNav.SetFlags(flags);
+    eventNav.SetEventObject(FindFocus());
+    return GetEventHandler()->ProcessEvent(eventNav);
+#endif // wxHAS_NATIVE_TAB_TRAVERSAL/!wxHAS_NATIVE_TAB_TRAVERSAL
+}
+
+void wxWindowBase::DoMoveInTabOrder(wxWindow *win, WindowOrder move)
+{
+    // check that we're not a top level window
+    wxCHECK_RET( GetParent(),
+                    _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
+
+    // detect the special case when we have nothing to do anyhow and when the
+    // code below wouldn't work
+    if ( win == this )
+        return;
+
+    // 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 == OrderAfter )
+    {
+        i = i->GetNext();
+    }
+
+    if ( i )
+    {
+        siblings.Insert(i, self);
+    }
+    else // OrderAfter and win was the last sibling
+    {
+        siblings.Append(self);
+    }
+}
+
+// ----------------------------------------------------------------------------
+// focus handling
+// ----------------------------------------------------------------------------
+
+/*static*/ wxWindow* wxWindowBase::FindFocus()
+{
+    wxWindowBase *win = DoFindFocus();
+    return win ? win->GetMainWindowOfCompositeControl() : NULL;
+}
+

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


@@ -2205,7 +2752,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())


@@ -2248,7 +2795,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())


@@ -2348,20 +2895,22 @@ 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())
+
+    if (!title.empty())

     {
         *name = title;
         return wxACC_OK;
     {
         *name = title;
         return wxACC_OK;


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


@@ -2450,7 +2999,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())


@@ -2460,14 +3009,14 @@ 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())
         return wxACC_FAIL;
 
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
         return wxACC_FAIL;
 

-    wxString ht(GetWindow()->GetHelpText());
-    if (!ht.IsEmpty())
+    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
+    if (!ht.empty())

     {
         *description = ht;
         return wxACC_OK;
     {
         *description = ht;
         return wxACC_OK;


@@ -2476,14 +3025,14 @@ 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())
         return wxACC_FAIL;
 
 {
     wxASSERT( GetWindow() != NULL );
     if (!GetWindow())
         return wxACC_FAIL;
 

-    wxString ht(GetWindow()->GetHelpText());
-    if (!ht.IsEmpty())
+    wxString ht(GetWindow()->GetHelpTextAtPoint(wxDefaultPosition, wxHelpEvent::Origin_Keyboard));
+    if (!ht.empty())

     {
         *helpText = ht;
         return wxACC_OK;
     {
         *helpText = ht;
         return wxACC_OK;


@@ -2493,7 +3042,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())


@@ -2509,7 +3058,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;


@@ -2529,7 +3078,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.


@@ -2539,7 +3090,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;


@@ -2559,12 +3110,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())


@@ -2574,7 +3127,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())


@@ -2587,7 +3140,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())


@@ -2596,15 +3149,16 @@ wxAccStatus wxWindowAccessible::GetFocus(int* childId, wxAccessible** child)
     return wxACC_NOT_IMPLEMENTED;
 }
 
     return wxACC_NOT_IMPLEMENTED;
 }
 

+#if wxUSE_VARIANT

 // Gets a variant representing the selected children
 // of this object.
 // Acceptable values:
 // Gets a variant representing the selected children
 // of this object.
 // Acceptable values:

-// - a null variant (IsNull() returns TRUE)
+// - a null variant (IsNull() returns true)

 // - a list variant (GetType() == wxT("list")
 // - 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
 // - a list variant (GetType() == wxT("list")
 // - 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())


@@ -2612,5 +3166,25 @@ wxAccStatus wxWindowAccessible::GetSelections(wxVariant* selections)
 
     return wxACC_NOT_IMPLEMENTED;
 }
 
     return wxACC_NOT_IMPLEMENTED;
 }

+#endif // wxUSE_VARIANT

 
 #endif // wxUSE_ACCESSIBILITY
 
 #endif // wxUSE_ACCESSIBILITY

+
+// ----------------------------------------------------------------------------
+// RTL support
+// ----------------------------------------------------------------------------
+
+wxCoord
+wxWindowBase::AdjustForLayoutDirection(wxCoord x,
+                                       wxCoord width,
+                                       wxCoord widthTotal) const
+{
+    if ( GetLayoutDirection() == wxLayout_RightToLeft )
+    {
+        x = widthTotal - x - width;
+    }
+
+    return x;
+}
+
+