Include the size of any window borders (size vs. clientsize

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 0cb93c366559b6bd169fedbf1e7b3f48e3945260..29a9fa84023cd682bf16da4f830b0d9ff5e609a7 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -77,11 +77,17 @@
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 
     #include "wx/caret.h"
 #endif // wxUSE_CARET
 

+#if wxUSE_SYSTEM_OPTIONS
+    #include "wx/sysopt.h"
+#endif
+

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

-#if defined(__WXPM__)
+#if defined(__WXPALMOS__)
+int wxWindowBase::ms_lastControlId = 32767;
+#elif defined(__WXPM__)

 int wxWindowBase::ms_lastControlId = 2000;
 #else
 int wxWindowBase::ms_lastControlId = -200;
 int wxWindowBase::ms_lastControlId = 2000;
 #else
 int wxWindowBase::ms_lastControlId = -200;


@@ -121,9 +127,12 @@ wxWindowBase::wxWindowBase()
 
     // no constraints on the minimal window size
     m_minWidth =
 
     // no constraints on the minimal window size
     m_minWidth =

-    m_maxWidth = wxDefaultSize.x;
+    m_maxWidth = wxDefaultCoord;

     m_minHeight =
     m_minHeight =

-    m_maxHeight = wxDefaultSize.y;
+    m_maxHeight = wxDefaultCoord;
+
+    // invalidiated cache value
+    m_bestSizeCache = wxDefaultSize;

 
     // window are created enabled and visible by default
     m_isShown =
 
     // window are created enabled and visible by default
     m_isShown =


@@ -142,11 +151,16 @@ wxWindowBase::wxWindowBase()
     m_hasBgCol =
     m_hasFgCol =
     m_hasFont = false;
     m_hasBgCol =
     m_hasFgCol =
     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;


@@ -180,11 +194,17 @@ wxWindowBase::wxWindowBase()
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =
     m_virtualSize = wxDefaultSize;
 
     m_minVirtualWidth =

-    m_maxVirtualWidth = wxDefaultSize.x;
+    m_maxVirtualWidth = wxDefaultCoord;

     m_minVirtualHeight =
     m_minVirtualHeight =

-    m_maxVirtualHeight = wxDefaultSize.y;
+    m_maxVirtualHeight = wxDefaultCoord;

 
     m_windowVariant = wxWINDOW_VARIANT_NORMAL;
 
     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)
     m_themeEnabled = false;
 
     // Whether we're using the current theme for this window (wxGTK only for now)
     m_themeEnabled = false;


@@ -370,6 +390,7 @@ void wxWindowBase::Centre(int direction)
     int widthParent, heightParent;
 
     wxWindow *parent = NULL;
     int widthParent, heightParent;
 
     wxWindow *parent = NULL;

+    wxTopLevelWindow *winTop = NULL;

 
     if ( !(direction & wxCENTRE_ON_SCREEN) )
     {
 
     if ( !(direction & wxCENTRE_ON_SCREEN) )
     {


@@ -391,9 +412,10 @@ void wxWindowBase::Centre(int direction)
         // Windows, for example, this places it completely off the screen
         if ( parent )
         {
         // Windows, for example, this places it completely off the screen
         if ( parent )
         {

-            wxTopLevelWindow *winTop = wxDynamicCast(parent, wxTopLevelWindow);
+            winTop = wxDynamicCast(parent, wxTopLevelWindow);

             if ( winTop && winTop->IsIconized() )
             {
             if ( winTop && winTop->IsIconized() )
             {

+                winTop = NULL;

                 parent = NULL;
             }
         }
                 parent = NULL;
             }
         }


@@ -416,11 +438,16 @@ void wxWindowBase::Centre(int direction)
     {
         if ( IsTopLevel() )
         {
     {
         if ( IsTopLevel() )
         {

-            // centre on the parent
-            parent->GetSize(&widthParent, &heightParent);
+            if(winTop)
+                winTop->GetRectForTopLevelChildren(&posParent.x, &posParent.y, &widthParent, &heightParent);
+            else
+            {
+                // centre on the parent
+                parent->GetSize(&widthParent, &heightParent);

 
 

-            // adjust to the parents position
-            posParent = parent->GetPosition();
+                // adjust to the parents position
+                posParent = parent->GetPosition();
+            }

         }
         else
         {
         }
         else
         {


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

-    int xNew = wxDefaultPosition.x,
-        yNew = wxDefaultPosition.y;
+    int xNew = wxDefaultCoord,
+        yNew = wxDefaultCoord;

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


@@ -445,9 +472,8 @@ void wxWindowBase::Centre(int direction)
     yNew += posParent.y;
 
     // Base size of the visible dimensions of the display
     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);
+    // to take into account the taskbar. And the Mac menu bar at top.
+    wxRect clientrect = wxGetClientDisplayRect();

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


@@ -455,25 +481,25 @@ void wxWindowBase::Centre(int direction)
     //     if the parent is at least partially present here.
     if (posParent.x + widthParent >= 0)  // if parent is (partially) 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 (xNew < clientrect.GetLeft())
+            xNew = clientrect.GetLeft();
+        else if (xNew + width > clientrect.GetRight())
+            xNew = clientrect.GetRight() - width;

     }
     if (posParent.y + heightParent >= 0)  // if parent is (partially) on the main display
     {
     }
     if (posParent.y + heightParent >= 0)  // if parent is (partially) on the main display
     {

-        if (yNew+height > size.y)
-            yNew = size.y-height-1;
+        if (yNew + height > clientrect.GetBottom())
+            yNew = clientrect.GetBottom() - height;

 
         // Make certain that the title bar is initially visible
         // always, even if this would push the bottom of the
 
         // 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;
+        // dialog off the visible area of the display
+        if (yNew < clientrect.GetTop())
+            yNew = clientrect.GetTop();

     }
 
     // move the window to this position (keeping the old size but using
     }
 
     // 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() and not Move() to allow xNew and/or yNew to be wxDefaultCoord)

     SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
 }
 
     SetSize(xNew, yNew, width, height, wxSIZE_ALLOW_MINUS_ONE);
 }
 


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

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

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


@@ -501,7 +527,7 @@ void wxWindowBase::FitInside()
 static bool wxHasRealChildren(const wxWindowBase* win)
 {
     int realChildCount = 0;
 static bool wxHasRealChildren(const wxWindowBase* win)
 {
     int realChildCount = 0;

-    
+

     for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
           node;
           node = node->GetNext() )
     for ( wxWindowList::compatibility_iterator node = win->GetChildren().GetFirst();
           node;
           node = node->GetNext() )


@@ -514,12 +540,24 @@ static bool wxHasRealChildren(const wxWindowBase* win)
 }
 #endif
 
 }
 #endif
 

+void wxWindowBase::InvalidateBestSize()
+{
+    m_bestSizeCache = wxDefaultSize;
+
+    // parent's best size calculation may depend on its children's
+    // best sizes, so let's invalidate it as well to be safe:
+    if (m_parent)
+        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 )


@@ -555,7 +593,7 @@ 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
     else if ( !GetChildren().empty()
     }
 #endif // wxUSE_CONSTRAINTS
     else if ( !GetChildren().empty()


@@ -590,9 +628,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 == wxDefaultPosition.x )
+            if ( wx == wxDefaultCoord )

                 wx = 0;
                 wx = 0;

-            if ( wy == wxDefaultPosition.y )
+            if ( wy == wxDefaultCoord )

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


@@ -607,45 +645,57 @@ wxSize wxWindowBase::DoGetBestSize() const
         maxX += 7;
         maxY += 14;
 
         maxX += 7;
         maxY += 14;
 

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

     }
     else // ! has children
     {
     }
     else // ! has children
     {

-        // for a generic window there is no natural best size - just use either the
-        // minimum size if there is one, or the current size
+        // For a generic window there is no natural best size - just use
+        // either the minimum size if there is one, or the current size.
+        // These are returned as-is, unadjusted by the client size difference.

         if ( GetMinSize().IsFullySpecified() )
             return GetMinSize();
         else
             return GetSize();
     }
         if ( GetMinSize().IsFullySpecified() )
             return GetMinSize();
         else
             return GetSize();
     }

+
+    // 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;

 }
 
 }
 

-void wxWindowBase::SetBestSize(const wxSize& size)
+
+wxSize wxWindowBase::GetBestFittingSize() const

 {
 {

-    // If the given size is incomplete then merge with the best size.
-    wxSize sizeBest;
-    if ( size.x == wxDefaultSize.x || size.y == wxDefaultSize.y )
+    // merge the best size with the min size, giving priority to the min size
+    wxSize min = GetMinSize();
+    if (min.x == wxDefaultCoord || min.y == wxDefaultCoord)

     {
     {

-        sizeBest = DoGetBestSize();
-        if ( size.x != wxDefaultSize.x )
-            sizeBest.x = size.x;
-        if ( size.y != wxDefaultSize.y )
-            sizeBest.y = size.y;
-    }
-    else // have complete explicit size
-    {
-        sizeBest = size;
+        wxSize best = GetBestSize();
+        if (min.x == wxDefaultCoord) min.x =  best.x;
+        if (min.y == wxDefaultCoord) min.y =  best.y;

     }
     }

+    return min;
+}
+
+
+void wxWindowBase::SetBestFittingSize(const wxSize& size)
+{
+    // Set the min size to the size passed in.  This will usually either be
+    // wxDefaultSize or the size passed to this window's ctor/Create function.
+    SetMinSize(size);

 
 

-    // Change the size if needed
-    if (GetSize() != sizeBest)
-        SetSize(sizeBest);
+    // Merge the size with the best size if needed
+    wxSize best = GetBestFittingSize();

 
 

-    // don't shrink the control below its best size
-    m_minWidth = sizeBest.x;
-    m_minHeight = sizeBest.y;
+    // 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
 {


@@ -653,14 +703,14 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const
 }
 
 // set the min/max size of the window
 }
 
 // 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::DoSetSizeHints(int minW, int minH,
+                                  int maxW, int maxH,
+                                  int WXUNUSED(incW), int WXUNUSED(incH))

 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it
 {
     // setting min width greater than max width leads to infinite loops under
     // X11 and generally doesn't make any sense, so don't allow it

-    wxCHECK_RET( (minW == wxDefaultSize.x || maxW == wxDefaultSize.x || minW <= maxW) &&
-                    (minH == wxDefaultSize.y || maxH == wxDefaultSize.y || minH <= maxH),
+    wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) &&
+                    (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH),

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


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

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

         x = m_minVirtualWidth;
         x = m_minVirtualWidth;

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

         x = m_maxVirtualWidth;
         x = m_maxVirtualWidth;

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

         y = m_minVirtualHeight;
         y = m_minVirtualHeight;

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

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


@@ -935,18 +985,25 @@ void wxWindowBase::InheritAttributes()
     // 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)
     // 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_hasFont && !m_hasFont )
+    if ( parent->m_inheritFont && !m_hasFont )

         SetFont(parent->GetFont());
 
     // in addition, there is a possibility to explicitly forbid inheriting
     // colours at each class level by overriding ShouldInheritColours()
     if ( ShouldInheritColours() )
     {
         SetFont(parent->GetFont());
 
     // in addition, there is a possibility to explicitly forbid inheriting
     // colours at each class level by overriding ShouldInheritColours()
     if ( ShouldInheritColours() )
     {

-        if ( parent->m_hasFgCol && !m_hasFgCol )
+        if ( parent->m_inheritFgCol && !m_hasFgCol )

             SetForegroundColour(parent->GetForegroundColour());
 
             SetForegroundColour(parent->GetForegroundColour());
 

-        if ( parent->m_hasBgCol && !m_hasBgCol )
+        // 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());
             SetBackgroundColour(parent->GetBackgroundColour());

+#endif // 0

     }
 }
 
     }
 }
 


@@ -980,11 +1037,10 @@ wxColour wxWindowBase::GetBackgroundColour() const
         if ( !colBg.Ok() )
             colBg = GetClassDefaultAttributes().colBg;
 
         if ( !colBg.Ok() )
             colBg = GetClassDefaultAttributes().colBg;
 

-        // cache it for the next call
-        wxConstCast(this, wxWindowBase)->m_backgroundColour = colBg;
+        return colBg;

     }
     }

-
-    return m_backgroundColour;
+    else
+        return m_backgroundColour;

 }
 
 wxColour wxWindowBase::GetForegroundColour() const
 }
 
 wxColour wxWindowBase::GetForegroundColour() const


@@ -999,33 +1055,36 @@ wxColour wxWindowBase::GetForegroundColour() const
         if ( !colFg.Ok() )
             colFg = GetClassDefaultAttributes().colFg;
 
         if ( !colFg.Ok() )
             colFg = GetClassDefaultAttributes().colFg;
 

-        wxConstCast(this, wxWindowBase)->m_foregroundColour = colFg;
+        return colFg;

     }
     }

-
-    return m_foregroundColour;
+    else
+        return m_foregroundColour;

 }
 
 bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
 {
 }
 
 bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
 {

-    if ( !colour.Ok() || (colour == m_backgroundColour) )
+    if ( colour == m_backgroundColour )

         return false;
 
         return false;
 

-    m_backgroundColour = colour;
-
-    m_hasBgCol = true;
+    m_hasBgCol = colour.Ok();
+    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 )
 {
     return true;
 }
 
 bool wxWindowBase::SetForegroundColour( const wxColour &colour )
 {

-    if ( !colour.Ok() || (colour == m_foregroundColour) )
+    if (colour == m_foregroundColour )

         return false;
 
         return false;
 

+    m_hasFgCol = colour.Ok();
+    m_inheritFgCol = m_hasFgCol;

     m_foregroundColour = colour;
     m_foregroundColour = colour;

-
-    m_hasFgCol = true;
-
+    SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );

     return true;
 }
 
     return true;
 }
 


@@ -1044,7 +1103,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
     return true;
 }
 
     return true;
 }
 

-wxFont& wxWindowBase::DoGetFont() const
+wxFont wxWindowBase::GetFont() const

 {
     // logic is the same as in GetBackgroundColour()
     if ( !m_font.Ok() )
 {
     // logic is the same as in GetBackgroundColour()
     if ( !m_font.Ok() )


@@ -1055,18 +1114,14 @@ wxFont& wxWindowBase::DoGetFont() const
         if ( !font.Ok() )
             font = GetClassDefaultAttributes().font;
 
         if ( !font.Ok() )
             font = GetClassDefaultAttributes().font;
 

-        wxConstCast(this, wxWindowBase)->m_font = font;
+        return font;

     }
     }

-
-    // cast is here for non-const GetFont() convenience
-    return wxConstCast(this, wxWindowBase)->m_font;
+    else
+        return m_font;

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

-    if ( !font.Ok() )
-        return false;
-

     if ( font == m_font )
     {
         // no change
     if ( font == m_font )
     {
         // no change


@@ -1074,8 +1129,10 @@ bool wxWindowBase::SetFont(const wxFont& font)
     }
 
     m_font = font;
     }
 
     m_font = font;

+    m_hasFont = font.Ok();
+    m_inheritFont = m_hasFont;

 
 

-    m_hasFont = true;
+    InvalidateBestSize();

 
     return true;
 }
 
     return true;
 }


@@ -1181,7 +1238,7 @@ void wxWindowBase::ClearBackground()
 // 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;


@@ -1197,7 +1254,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;


@@ -1329,7 +1386,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);

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


@@ -1886,22 +1943,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

-        if ( x != wxDefaultPosition.x )
+        if ( x != wxDefaultCoord )

         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }
         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }

-        if ( y != wxDefaultPosition.y )
+        if ( y != wxDefaultCoord )

         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);
         }
         {
             constr->top.SetValue(y);
             constr->top.SetDone(true);
         }

-        if ( w != wxDefaultSize.x )
+        if ( w != wxDefaultCoord )

         {
             constr->width.SetValue(w);
             constr->width.SetDone(true);
         }
         {
             constr->width.SetValue(w);
             constr->width.SetDone(true);
         }

-        if ( h != wxDefaultSize.y )
+        if ( h != wxDefaultCoord )

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


@@ -1914,12 +1971,12 @@ void wxWindowBase::MoveConstraint(int x, int y)
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {
     wxLayoutConstraints *constr = GetConstraints();
     if ( constr )
     {

-        if ( x != wxDefaultPosition.x )
+        if ( x != wxDefaultCoord )

         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }
         {
             constr->left.SetValue(x);
             constr->left.SetDone(true);
         }

-        if ( y != wxDefaultPosition.y )
+        if ( y != wxDefaultCoord )

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


@@ -1988,7 +2045,7 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co
 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) )
     {


@@ -2025,12 +2082,16 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
             if ( event.GetText() != control->GetLabel() )
                 control->SetLabel(event.GetText());
         }
             if ( event.GetText() != control->GetLabel() )
                 control->SetLabel(event.GetText());
         }

+    }
+#endif // wxUSE_CONTROLS
+
+    if ( event.GetSetChecked() )
+    {

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

-            if ( event.GetSetChecked() )
-                checkbox->SetValue(event.GetChecked());
+            checkbox->SetValue(event.GetChecked());

         }
 #endif // wxUSE_CHECKBOX
 
         }
 #endif // wxUSE_CHECKBOX
 


@@ -2038,12 +2099,10 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event)
         wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
         if ( radiobtn )
         {
         wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);
         if ( radiobtn )
         {

-            if ( event.GetSetChecked() )
-                radiobtn->SetValue(event.GetChecked());
+            radiobtn->SetValue(event.GetChecked());

         }
 #endif // wxUSE_RADIOBTN
     }
         }
 #endif // wxUSE_RADIOBTN
     }

-#endif

 }
 
 #if 0
 }
 
 #if 0


@@ -2071,10 +2130,10 @@ 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)
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)

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

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

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


@@ -2084,10 +2143,10 @@ 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)
+    wxPoint pt2 = wxDefaultPosition;
+    if (pt.x != wxDefaultCoord)

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

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

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


@@ -2108,12 +2167,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,


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

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

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


@@ -2177,6 +2238,11 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
                                       L" (Unicode)",
 #else
                                       "",
                                       L" (Unicode)",
 #else
                                       "",

+#endif
+#ifdef __WXDEBUG__
+                                      _T(" Debug build"),
+#else
+                                      wxEmptyString,

 #endif
                                       __TDATE__,
                                       __TTIME__
 #endif
                                       __TDATE__,
                                       __TTIME__


@@ -2400,6 +2466,68 @@ bool wxWindowBase::TryParent(wxEvent& event)
     return wxEvtHandler::TryParent(event);
 }
 
     return wxEvtHandler::TryParent(event);
 }
 

+// ----------------------------------------------------------------------------
+// keyboard navigation
+// ----------------------------------------------------------------------------
+
+// Navigates in the specified direction.
+bool wxWindowBase::Navigate(int flags)
+{
+    wxNavigationKeyEvent eventNav;
+    eventNav.SetFlags(flags);
+    eventNav.SetEventObject(this);
+    if ( GetParent()->GetEventHandler()->ProcessEvent(eventNav) )
+    {
+        return true;
+    }
+    return false;
+}
+
+void wxWindowBase::DoMoveInTabOrder(wxWindow *win, MoveKind move)
+{
+    // check that we're not a top level window
+    wxCHECK_RET( GetParent(),
+                    _T("MoveBefore/AfterInTabOrder() don't work for TLWs!") );
+
+    // 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 == MoveAfter )
+    {
+        i = i->GetNext();
+    }
+
+    if ( i )
+    {
+        siblings.Insert(i, self);
+    }
+    else // MoveAfter 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
 // ----------------------------------------------------------------------------


@@ -2570,12 +2698,14 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name)
     // This will eventually be replaced by specialised
     // accessible classes, one for each kind of wxWidgets
     // control or window.
     // This will eventually be replaced by specialised
     // accessible classes, one for each kind of wxWidgets
     // 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;


@@ -2681,7 +2811,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString*
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());

-    if (!ht.IsEmpty())
+    if (!ht.empty())

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


@@ -2697,7 +2827,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());
         return wxACC_FAIL;
 
     wxString ht(GetWindow()->GetHelpText());

-    if (!ht.IsEmpty())
+    if (!ht.empty())

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


@@ -2817,7 +2947,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible**
 // 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 list variant (GetType() == wxT("list")
 // - an integer representing the selected child element,
 //   or 0 if this object is selected (GetType() == wxT("long")