Removed wxPATH_NORM_CASE from Normalize or files won't be written

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

diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp
index 068a995fd34743da17e9b9b48819b2691cf0fb75..89f902063e3d8f6644a11524558fc020ac40f690 100644 (file)
--- a/src/common/wincmn.cpp
+++ b/src/common/wincmn.cpp
@@ -35,12 +35,14 @@
     #include "wx/frame.h"
     #include "wx/defs.h"
     #include "wx/window.h"
     #include "wx/frame.h"
     #include "wx/defs.h"
     #include "wx/window.h"

+    #include "wx/control.h"

     #include "wx/checkbox.h"
     #include "wx/radiobut.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"
     #include "wx/checkbox.h"
     #include "wx/radiobut.h"
     #include "wx/textctrl.h"
     #include "wx/settings.h"
     #include "wx/dialog.h"
     #include "wx/msgdlg.h"

+    #include "wx/statusbr.h"

 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS
 #endif //WX_PRECOMP
 
 #if wxUSE_CONSTRAINTS


@@ -52,6 +54,10 @@
     #include "wx/dnd.h"
 #endif // wxUSE_DRAG_AND_DROP
 
     #include "wx/dnd.h"
 #endif // wxUSE_DRAG_AND_DROP
 

+#if wxUSE_HELP
+    #include "wx/cshelp.h"
+#endif // wxUSE_HELP
+

 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
 #endif // wxUSE_TOOLTIPS


@@ -76,6 +82,11 @@ BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler)
     EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
     EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)
     EVT_SYS_COLOUR_CHANGED(wxWindowBase::OnSysColourChanged)
     EVT_INIT_DIALOG(wxWindowBase::OnInitDialog)
     EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick)

+
+#if wxUSE_HELP
+    EVT_HELP(-1, wxWindowBase::OnHelp)
+#endif // wxUSE_HELP
+

 END_EVENT_TABLE()
 
 // ============================================================================
 END_EVENT_TABLE()
 
 // ============================================================================


@@ -104,10 +115,6 @@ void wxWindowBase::InitBase()
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 
     m_isShown = FALSE;
     m_isEnabled = TRUE;
 

-    // no client data (yet)
-    m_clientData = NULL;
-    m_clientDataType = ClientData_None;
-

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


@@ -117,17 +124,20 @@ void wxWindowBase::InitBase()
 #endif // wxUSE_VALIDATORS
 
     // use the system default colours
 #endif // wxUSE_VALIDATORS
 
     // use the system default colours

-    wxSystemSettings settings;
+    m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE);
+    m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);

 
 

-    m_backgroundColour = settings.GetSystemColour(wxSYS_COLOUR_BTNFACE);
-    // m_foregroundColour = *wxBLACK;  // TODO take this from sys settings too?
-    m_foregroundColour = wxSystemSettings::GetSystemColour(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__

 
 

-#if !defined(__WXMAC__) && !defined(__WXGTK__)
-    m_font = *wxSWISS_FONT;         //      and this?
-#else
-       m_font = settings.GetSystemFont(wxSYS_DEFAULT_GUI_FONT);
-#endif
+    // the colours/fonts are default for now
+    m_hasBgCol =
+    m_hasFgCol =
+    m_hasFont = FALSE;

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


@@ -156,6 +166,9 @@ void wxWindowBase::InitBase()
 #if wxUSE_CARET
     m_caret = (wxCaret *)NULL;
 #endif // wxUSE_CARET
 #if wxUSE_CARET
     m_caret = (wxCaret *)NULL;
 #endif // wxUSE_CARET

+
+    // Whether we're using the current theme for this window (wxGTK only for now)
+    m_themeEnabled = FALSE;

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


@@ -183,6 +196,14 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
     SetValidator(validator);
 #endif // wxUSE_VALIDATORS
 
     SetValidator(validator);
 #endif // wxUSE_VALIDATORS
 

+    // if the parent window has wxWS_EX_VALIDATE_RECURSIVELY set, we want to
+    // have it too - like this it's possible to set it only in the top level
+    // dialog/frame and all children will inherit it by defult
+    if ( parent && (parent->GetExtraStyle() & wxWS_EX_VALIDATE_RECURSIVELY) )
+    {
+        SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
+    }
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -193,6 +214,8 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent,
 // common clean up
 wxWindowBase::~wxWindowBase()
 {
 // common clean up
 wxWindowBase::~wxWindowBase()
 {

+    wxASSERT_MSG( GetCapture() != this, wxT("attempt to destroy window with mouse capture") );
+

     // FIXME if these 2 cases result from programming errors in the user code
     //       we should probably assert here instead of silently fixing them
 
     // FIXME if these 2 cases result from programming errors in the user code
     //       we should probably assert here instead of silently fixing them
 


@@ -206,16 +229,6 @@ wxWindowBase::~wxWindowBase()
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 
 
     wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") );
 

-    // make sure that there are no dangling pointers left pointing to us
-    wxPanel *panel = wxDynamicCast(GetParent(), wxPanel);
-    if ( panel )
-    {
-        if ( panel->GetLastFocus() == this )
-        {
-            panel->SetLastFocus((wxWindow *)NULL);
-        }
-    }
-

 #if wxUSE_CARET
     if ( m_caret )
         delete m_caret;
 #if wxUSE_CARET
     if ( m_caret )
         delete m_caret;


@@ -226,10 +239,6 @@ wxWindowBase::~wxWindowBase()
         delete m_windowValidator;
 #endif // wxUSE_VALIDATORS
 
         delete m_windowValidator;
 #endif // wxUSE_VALIDATORS
 

-    // we only delete object data, not untyped
-    if ( m_clientDataType == ClientData_Object )
-        delete m_clientObject;
-

 #if wxUSE_CONSTRAINTS
     // Have to delete constraints/sizer FIRST otherwise sizers may try to look
     // at deleted windows as they delete themselves.
 #if wxUSE_CONSTRAINTS
     // Have to delete constraints/sizer FIRST otherwise sizers may try to look
     // at deleted windows as they delete themselves.


@@ -258,6 +267,12 @@ wxWindowBase::~wxWindowBase()
     if ( m_tooltip )
         delete m_tooltip;
 #endif // wxUSE_TOOLTIPS
     if ( m_tooltip )
         delete m_tooltip;
 #endif // wxUSE_TOOLTIPS

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

 }
 
 bool wxWindowBase::Destroy()
 }
 
 bool wxWindowBase::Destroy()


@@ -295,6 +310,7 @@ bool wxWindowBase::DestroyChildren()
 
         wxASSERT_MSG( child, wxT("children list contains empty nodes") );
 
 
         wxASSERT_MSG( child, wxT("children list contains empty nodes") );
 

+        child->Show(FALSE);

         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),
         delete child;
 
         wxASSERT_MSG( !GetChildren().Find(child),


@@ -311,13 +327,32 @@ bool wxWindowBase::DestroyChildren()
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {
 // centre the window with respect to its parent in either (or both) directions
 void wxWindowBase::Centre(int direction)
 {

+    // the position/size of the parent window or of the entire screen
+    wxPoint posParent;

     int widthParent, heightParent;
 
     int widthParent, heightParent;
 

-    wxWindow *parent = GetParent();
-    if ( !parent )
+    wxWindow *parent = NULL;
+
+    if ( !(direction & wxCENTRE_ON_SCREEN) )

     {
     {

-        // no other choice
-        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();
+            }
+        }
+
+        // did we find the parent?
+        if ( !parent )
+        {
+            // no other choice
+            direction |= wxCENTRE_ON_SCREEN;
+        }

     }
 
     if ( direction & wxCENTRE_ON_SCREEN )
     }
 
     if ( direction & wxCENTRE_ON_SCREEN )


@@ -327,8 +362,19 @@ void wxWindowBase::Centre(int direction)
     }
     else
     {
     }
     else
     {

-        // centre inside the parents rectangle
-        parent->GetClientSize(&widthParent, &heightParent);
+        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;
     }
 
     int width, height;


@@ -343,22 +389,36 @@ void wxWindowBase::Centre(int direction)
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 
     if ( direction & wxVERTICAL )
         yNew = (heightParent - height)/2;
 

-    // controls are always centered on their parent because it doesn't make
-    // sense to centre them on the screen
-    if ( !(direction & wxCENTRE_ON_SCREEN) || wxDynamicCast(this, wxControl) )
-    {
-        // theo nly chance to get this is to have a wxControl without parent
-        wxCHECK_RET( parent, wxT("a control must have a parent") );
+    xNew += posParent.x;
+    yNew += posParent.y;

 
 

-        // adjust to the parents client area origin
-        wxPoint posParent = parent->ClientToScreen(wxPoint(0, 0));
+    // Base size of the visible dimensions of the display
+    // to take into account the taskbar
+    wxRect rect = wxGetClientDisplayRect();
+    wxSize size (rect.width,rect.height);

 
 

-        xNew += posParent.x;
-        yNew += posParent.y;
+    if (posParent.x >= 0)  // if parent is on the main display
+    {
+        if (xNew < 0)
+            xNew = 0;
+        else if (xNew+width > size.x)
+            xNew = size.x-width-1;
+    }
+    if (posParent.y >= 0)  // if parent is 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 centre of this window to this position
-    Move(xNew, yNew);
+    // 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);

 }
 
 // fits the window around the children
 }
 
 // fits the window around the children


@@ -366,7 +426,14 @@ void wxWindowBase::Fit()
 {
     if ( GetChildren().GetCount() > 0 )
     {
 {
     if ( GetChildren().GetCount() > 0 )
     {

-        SetClientSize(DoGetBestSize());
+        wxSize size = DoGetBestSize();
+
+        // for compatibility with the old versions and because it really looks
+        // slightly more pretty like this, add a pad
+        size.x += 7;
+        size.y += 14;
+
+        SetClientSize(size);

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


@@ -385,15 +452,28 @@ wxSize wxWindowBase::DoGetBestSize() const
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();
               node = node->GetNext() )
         {
             wxWindow *win = node->GetData();

-            if ( win->IsTopLevel() )
+            if ( win->IsTopLevel()
+#if wxUSE_STATUSBAR
+                    || wxDynamicCast(win, wxStatusBar)
+#endif // wxUSE_STATUSBAR
+               )

             {
                 // dialogs and frames lie in different top level windows -
             {
                 // dialogs and frames lie in different top level windows -

-                // don't deal with them here
+                // don't deal with them here; as for the status bars, they
+                // don't lie in the client area at all

                 continue;
             }
 
             int wx, wy, ww, wh;
             win->GetPosition(&wx, &wy);
                 continue;
             }
 
             int wx, wy, ww, wh;
             win->GetPosition(&wx, &wy);

+
+            // if the window hadn't been positioned yet, assume that it is in
+            // the origin
+            if ( wx == -1 )
+                wx = 0;
+            if ( wy == -1 )
+                wy = 0;
+

             win->GetSize(&ww, &wh);
             if ( wx + ww > maxX )
                 maxX = wx + ww;
             win->GetSize(&ww, &wh);
             if ( wx + ww > maxX )
                 maxX = wx + ww;


@@ -401,8 +481,7 @@ wxSize wxWindowBase::DoGetBestSize() const
                 maxY = wy + wh;
         }
 
                 maxY = wy + wh;
         }
 

-        // leave a margin
-        return wxSize(maxX + 7, maxY + 14);
+        return wxSize(maxX, maxY);

     }
     else
     {
     }
     else
     {


@@ -412,6 +491,12 @@ wxSize wxWindowBase::DoGetBestSize() const
     }
 }
 
     }
 }
 

+// by default the origin is not shifted
+wxPoint wxWindowBase::GetClientAreaOrigin() const
+{
+    return wxPoint(0, 0);
+}
+

 // set the min/max size of the window
 void wxWindowBase::SetSizeHints(int minW, int minH,
                                 int maxW, int maxH,
 // set the min/max size of the window
 void wxWindowBase::SetSizeHints(int minW, int minH,
                                 int maxW, int maxH,


@@ -471,6 +556,11 @@ void wxWindowBase::AddChild(wxWindowBase *child)
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 
 {
     wxCHECK_RET( child, wxT("can't add a NULL child") );
 

+    // this should never happen and it will lead to a crash later if it does
+    // because RemoveChild() will remove only one node from the children list
+    // and the other(s) one(s) will be left with dangling pointers in them
+    wxASSERT_MSG( !GetChildren().Find(child), _T("AddChild() called twice") );
+

     GetChildren().Append(child);
     child->SetParent(this);
 }
     GetChildren().Append(child);
     child->SetParent(this);
 }


@@ -543,6 +633,41 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler)
     return handlerA;
 }
 
     return handlerA;
 }
 

+bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler)
+{
+    wxCHECK_MSG( handler, FALSE, _T("RemoveEventHandler(NULL) called") );
+
+    wxEvtHandler *handlerPrev = NULL,
+                 *handlerCur = GetEventHandler();
+    while ( handlerCur )
+    {
+        wxEvtHandler *handlerNext = handlerCur->GetNextHandler();
+
+        if ( handlerCur == handler )
+        {
+            if ( handlerPrev )
+            {
+                handlerPrev->SetNextHandler(handlerNext);
+            }
+            else
+            {
+                SetEventHandler(handlerNext);
+            }
+
+            handler->SetNextHandler(NULL);
+
+            return TRUE;
+        }
+
+        handlerPrev = handlerCur;
+        handlerCur = handlerNext;
+    }
+
+    wxFAIL_MSG( _T("where has the event handler gone?") );
+
+    return FALSE;
+}
+

 // ----------------------------------------------------------------------------
 // cursors, fonts &c
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // cursors, fonts &c
 // ----------------------------------------------------------------------------


@@ -554,6 +679,8 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
 
     m_backgroundColour = colour;
 
 
     m_backgroundColour = colour;
 

+    m_hasBgCol = TRUE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -564,21 +691,22 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour )
 
     m_foregroundColour = colour;
 
 
     m_foregroundColour = colour;
 

+    m_hasFgCol = TRUE;
+

     return TRUE;
 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {
     return TRUE;
 }
 
 bool wxWindowBase::SetCursor(const wxCursor& cursor)
 {

-    // don't try to set invalid cursor, always fall back to the default
-    const wxCursor& cursorOk = cursor.Ok() ? cursor : *wxSTANDARD_CURSOR;
-
-    if ( (wxCursor&)cursorOk == m_cursor )
+    // setting an invalid cursor is ok, it means that we don't have any special
+    // cursor
+    if ( m_cursor == cursor )

     {
         // no change
         return FALSE;
     }
 
     {
         // no change
         return FALSE;
     }
 

-    m_cursor = cursorOk;
+    m_cursor = cursor;

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -588,7 +716,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
     // don't try to set invalid font, always fall back to the default
     const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
 
     // don't try to set invalid font, always fall back to the default
     const wxFont& fontOk = font.Ok() ? font : *wxSWISS_FONT;
 

-    if ( (wxFont&)fontOk == m_font )
+    if ( fontOk == m_font )

     {
         // no change
         return FALSE;
     {
         // no change
         return FALSE;


@@ -596,6 +724,8 @@ bool wxWindowBase::SetFont(const wxFont& font)
 
     m_font = fontOk;
 
 
     m_font = fontOk;
 

+    m_hasFont = TRUE;
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -635,9 +765,21 @@ void wxWindowBase::SetValidator(const wxValidator& validator)
 #endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_VALIDATORS
 
 // ----------------------------------------------------------------------------

-// update region testing
+// update region stuff

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

+wxRect wxWindowBase::GetUpdateClientRect() const
+{
+    wxRegion rgnUpdate = GetUpdateRegion();
+    rgnUpdate.Intersect(GetClientRect());
+    wxRect rectUpdate = rgnUpdate.GetBox();
+    wxPoint ptOrigin = GetClientAreaOrigin();
+    rectUpdate.x -= ptOrigin.x;
+    rectUpdate.y -= ptOrigin.y;
+
+    return rectUpdate;
+}
+

 bool wxWindowBase::IsExposed(int x, int y) const
 {
     return m_updateRegion.Contains(x, y) != wxOutRegion;
 bool wxWindowBase::IsExposed(int x, int y) const
 {
     return m_updateRegion.Contains(x, y) != wxOutRegion;


@@ -801,6 +943,64 @@ void wxWindowBase::InitDialog()
     GetEventHandler()->ProcessEvent(event);
 }
 
     GetEventHandler()->ProcessEvent(event);
 }
 

+// ----------------------------------------------------------------------------
+// context-sensitive help support
+// ----------------------------------------------------------------------------
+
+#if wxUSE_HELP
+
+// associate this help text with this window
+void wxWindowBase::SetHelpText(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(this, text);
+    }
+}
+
+// associate this help text with all windows with the same id as this
+// one
+void wxWindowBase::SetHelpTextForId(const wxString& text)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        helpProvider->AddHelp(GetId(), text);
+    }
+}
+
+// get the help string associated with this window (may be empty)
+wxString wxWindowBase::GetHelpText() const
+{
+    wxString text;
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        text = helpProvider->GetHelp(this);
+    }
+
+    return text;
+}
+
+// show help for this window
+void wxWindowBase::OnHelp(wxHelpEvent& event)
+{
+    wxHelpProvider *helpProvider = wxHelpProvider::Get();
+    if ( helpProvider )
+    {
+        if ( helpProvider->ShowHelp(this) )
+        {
+            // skip the event.Skip() below
+            return;
+        }
+    }
+
+    event.Skip();
+}
+
+#endif // wxUSE_HELP
+

 // ----------------------------------------------------------------------------
 // tooltips
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // tooltips
 // ----------------------------------------------------------------------------


@@ -1117,7 +1317,7 @@ void wxWindowBase::SetConstraintSizes(bool recurse)
         while (node)
         {
             wxWindow *win = node->GetData();
         while (node)
         {
             wxWindow *win = node->GetData();

-            if ( !win->IsTopLevel() )
+            if ( !win->IsTopLevel() && win->GetConstraints() )

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


@@ -1195,6 +1395,23 @@ void wxWindowBase::GetClientSizeConstraint(int *w, int *h) const
         GetClientSize(w, h);
 }
 
         GetClientSize(w, h);
 }
 

+void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags)
+{
+    // don't do it for the dialogs/frames - they float independently of their
+    // parent
+    if ( !IsTopLevel() )
+    {
+        wxWindow *parent = GetParent();
+        if ( !(sizeFlags & wxSIZE_NO_ADJUSTMENTS) && parent )
+        {
+            wxPoint pt(parent->GetClientAreaOrigin());
+            x += pt.x;
+            y += pt.y;
+        }
+    }
+}
+
+

 void wxWindowBase::GetPositionConstraint(int *x, int *y) const
 {
     wxLayoutConstraints *constr = GetConstraints();
 void wxWindowBase::GetPositionConstraint(int *x, int *y) const
 {
     wxLayoutConstraints *constr = GetConstraints();


@@ -1219,6 +1436,7 @@ void wxWindowBase::GetPositionConstraint(int *x, int *y) const
 // of control classes.
 void wxWindowBase::UpdateWindowUI()
 {
 // of control classes.
 void wxWindowBase::UpdateWindowUI()
 {

+#if wxUSE_CONTROLS

     wxUpdateUIEvent event(GetId());
     event.m_eventObject = this;
 
     wxUpdateUIEvent event(GetId());
     event.m_eventObject = this;
 


@@ -1229,19 +1447,21 @@ void wxWindowBase::UpdateWindowUI()
 
         if ( event.GetSetText() )
         {
 
         if ( event.GetSetText() )
         {

-            wxControl *control = wxDynamicCast(this, wxControl);
+            wxControl *control = wxDynamicCastThis(wxControl);

             if ( control )
             {
             if ( control )
             {

+#if wxUSE_TEXTCTRL

                 wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl);
                 if ( text )
                     text->SetValue(event.GetText());
                 else
                 wxTextCtrl *text = wxDynamicCast(control, wxTextCtrl);
                 if ( text )
                     text->SetValue(event.GetText());
                 else

+#endif // wxUSE_TEXTCTRL

                     control->SetLabel(event.GetText());
             }
         }
 
 #if wxUSE_CHECKBOX
                     control->SetLabel(event.GetText());
             }
         }
 
 #if wxUSE_CHECKBOX

-        wxCheckBox *checkbox = wxDynamicCast(this, wxCheckBox);
+        wxCheckBox *checkbox = wxDynamicCastThis(wxCheckBox);

         if ( checkbox )
         {
             if ( event.GetSetChecked() )
         if ( checkbox )
         {
             if ( event.GetSetChecked() )


@@ -1250,7 +1470,7 @@ void wxWindowBase::UpdateWindowUI()
 #endif // wxUSE_CHECKBOX
 
 #if wxUSE_RADIOBTN
 #endif // wxUSE_CHECKBOX
 
 #if wxUSE_RADIOBTN

-        wxRadioButton *radiobtn = wxDynamicCast(this, wxRadioButton);
+        wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton);

         if ( radiobtn )
         {
             if ( event.GetSetChecked() )
         if ( radiobtn )
         {
             if ( event.GetSetChecked() )


@@ -1258,6 +1478,7 @@ void wxWindowBase::UpdateWindowUI()
         }
 #endif // wxUSE_RADIOBTN
     }
         }
 #endif // wxUSE_RADIOBTN
     }

+#endif // wxUSE_CONTROLS

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


@@ -1290,51 +1511,6 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt)
     return pt2;
 }
 
     return pt2;
 }
 

-// ----------------------------------------------------------------------------
-// client data
-// ----------------------------------------------------------------------------
-
-void wxWindowBase::DoSetClientObject( wxClientData *data )
-{
-    wxASSERT_MSG( m_clientDataType != ClientData_Void,
-                  wxT("can't have both object and void client data") );
-
-    if ( m_clientObject )
-        delete m_clientObject;
-
-    m_clientObject = data;
-    m_clientDataType = ClientData_Object;
-}
-
-wxClientData *wxWindowBase::DoGetClientObject() const
-{
-    // it's not an error to call GetClientObject() on a window which doesn't
-    // have client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != ClientData_Void,
-                  wxT("this window doesn't have object client data") );
-
-    return m_clientObject;
-}
-
-void wxWindowBase::DoSetClientData( void *data )
-{
-    wxASSERT_MSG( m_clientDataType != ClientData_Object,
-                  wxT("can't have both object and void client data") );
-
-    m_clientData = data;
-    m_clientDataType = ClientData_Void;
-}
-
-void *wxWindowBase::DoGetClientData() const
-{
-    // it's not an error to call GetClientData() on a window which doesn't have
-    // client data at all - NULL will be returned
-    wxASSERT_MSG( m_clientDataType != ClientData_Object,
-                  wxT("this window doesn't have void client data") );
-
-    return m_clientData;
-}
-

 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // event handlers
 // ----------------------------------------------------------------------------


@@ -1367,14 +1543,21 @@ void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) )
 // process Ctrl-Alt-mclick
 void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 {
 // process Ctrl-Alt-mclick
 void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 {

+#if wxUSE_MSGDLG

     if ( event.ControlDown() && event.AltDown() )
     {
         // don't translate these strings
         wxString port;
     if ( event.ControlDown() && event.AltDown() )
     {
         // don't translate these strings
         wxString port;

+
+#ifdef __WXUNIVERSAL__
+        port = _T("Univ/");
+#endif // __WXUNIVERSAL__
+

         switch ( wxGetOsVersion() )
         {
             case wxMOTIF_X:     port = _T("Motif"); break;
         switch ( wxGetOsVersion() )
         {
             case wxMOTIF_X:     port = _T("Motif"); break;

-            case wxMACINTOSH:   port = _T("Mac"); break;
+            case wxMAC:
+            case wxMAC_DARWIN:  port = _T("Mac"); break;

             case wxBEOS:        port = _T("BeOS"); break;
             case wxGTK:
             case wxGTK_WIN32:
             case wxBEOS:        port = _T("BeOS"); break;
             case wxGTK:
             case wxGTK_WIN32:


@@ -1397,22 +1580,26 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event )
 
         wxMessageBox(wxString::Format(
                                       _T(
 
         wxMessageBox(wxString::Format(
                                       _T(

-                                        "       wxWindows Library (%s port)\n"
-                                        "Version %u.%u.%u, compiled at %s %s\n"
-                                        "   Copyright (c) 1995-2000 wxWindows team"
+                                        "       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,
                                         ),
                                       port.c_str(),
                                       wxMAJOR_VERSION,
                                       wxMINOR_VERSION,
                                       wxRELEASE_NUMBER,

-                                      __DATE__,
-                                      __TIME__
+#if wxUSE_UNICODE
+                                      L" (Unicode)",
+#else
+                                      "",
+#endif
+                                      __TDATE__,
+                                      __TTIME__

                                      ),
                      _T("wxWindows information"),
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
     }
     else
                                      ),
                      _T("wxWindows information"),
                      wxICON_INFORMATION | wxOK,
                      (wxWindow *)this);
     }
     else

+#endif // wxUSE_MSGDLG

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


@@ -1427,3 +1614,94 @@ void wxWindowListNode::DeleteData()
     delete (wxWindow *)GetData();
 }
 
     delete (wxWindow *)GetData();
 }
 

+// ----------------------------------------------------------------------------
+// borders
+// ----------------------------------------------------------------------------
+
+wxBorder wxWindowBase::GetBorder() const
+{
+    wxBorder border = (wxBorder)(m_windowStyle & wxBORDER_MASK);
+    if ( border == wxBORDER_DEFAULT )
+    {
+        border = GetDefaultBorder();
+    }
+
+    return border;
+}
+
+wxBorder wxWindowBase::GetDefaultBorder() const
+{
+    return wxBORDER_NONE;
+}
+
+// ----------------------------------------------------------------------------
+// hit testing
+// ----------------------------------------------------------------------------
+
+wxHitTest wxWindowBase::DoHitTest(wxCoord x, wxCoord y) const
+{
+    // here we just check if the point is inside the window or not
+
+    // check the top and left border first
+    bool outside = x < 0 || y < 0;
+    if ( !outside )
+    {
+        // check the right and bottom borders too
+        wxSize size = GetSize();
+        outside = x >= size.x || y >= size.y;
+    }
+
+    return outside ? wxHT_WINDOW_OUTSIDE : wxHT_WINDOW_INSIDE;
+}
+
+// ----------------------------------------------------------------------------
+// mouse capture
+// ----------------------------------------------------------------------------
+
+struct WXDLLEXPORT wxWindowNext
+{
+    wxWindow *win;
+    wxWindowNext *next;
+} *wxWindowBase::ms_winCaptureNext = NULL;
+
+void wxWindowBase::CaptureMouse()
+{
+    wxLogTrace(_T("mousecapture"), _T("CaptureMouse(0x%08x)"), this);
+    
+    wxWindow *winOld = GetCapture();
+    if ( winOld )
+    {
+        // save it on stack
+        wxWindowNext *item = new wxWindowNext;
+        item->win = winOld;
+        item->next = ms_winCaptureNext;
+        ms_winCaptureNext = item;
+    }
+    //else: no mouse capture to save
+
+    DoCaptureMouse();
+}
+
+void wxWindowBase::ReleaseMouse()
+{
+    wxLogTrace(_T("mousecapture"), _T("ReleaseMouse(0x%08x)"), this);
+
+    wxASSERT_MSG( GetCapture() == this, wxT("attempt to release mouse, but this window hasn't captured it") )
+
+    DoReleaseMouse();
+
+    if ( ms_winCaptureNext )
+    {
+        ms_winCaptureNext->win->CaptureMouse();
+
+        wxWindowNext *item = ms_winCaptureNext;
+        ms_winCaptureNext = item->next;
+        delete item;
+    }
+    //else: stack is empty, no previous capture
+
+    wxLogTrace(_T("mousecapture"),
+               _T("After ReleaseMouse() mouse is captured by 0x%08x"),
+               GetCapture());
+}
+