X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2654f7e423bb773ca52c8b465c6ec9abfa398e45..0281278534339322516fa6133ed4df925c2156be:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 14d868fdd8..d109b28adf 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -5,7 +5,7 @@ // Modified by: // Created: 13/07/98 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -47,6 +47,10 @@ #include "wx/dcclient.h" #endif //WX_PRECOMP +#if defined(__WXMAC__) && wxUSE_SCROLLBAR + #include "wx/scrolbar.h" +#endif + #if wxUSE_CONSTRAINTS #include "wx/layout.h" #endif // wxUSE_CONSTRAINTS @@ -73,11 +77,17 @@ #include "wx/caret.h" #endif // wxUSE_CARET +#if wxUSE_SYSTEM_OPTIONS + #include "wx/sysopt.h" +#endif + // ---------------------------------------------------------------------------- // static data // ---------------------------------------------------------------------------- -#if defined(__WXPM__) +#if defined(__WXPALMOS__) +int wxWindowBase::ms_lastControlId = 65535; +#elif defined(__WXPM__) int wxWindowBase::ms_lastControlId = 2000; #else int wxWindowBase::ms_lastControlId = -200; @@ -110,7 +120,6 @@ END_EVENT_TABLE() // the default initialization wxWindowBase::wxWindowBase() -: m_bestSize(wxDefaultSize) { // no window yet, no parent nor children m_parent = (wxWindow *)NULL; @@ -118,9 +127,12 @@ wxWindowBase::wxWindowBase() // no constraints on the minimal window size m_minWidth = + m_maxWidth = wxDefaultCoord; m_minHeight = - m_maxWidth = - m_maxHeight = -1; + m_maxHeight = wxDefaultCoord; + + // invalidiated cache value + m_bestSizeCache = wxDefaultSize; // window are created enabled and visible by default m_isShown = @@ -139,11 +151,16 @@ wxWindowBase::wxWindowBase() m_hasBgCol = m_hasFgCol = m_hasFont = false; + m_inheritBgCol = + m_inheritFgCol = + m_inheritFont = false; // no style bits m_exStyle = m_windowStyle = 0; + m_backgroundStyle = wxBG_STYLE_SYSTEM; + #if wxUSE_CONSTRAINTS // no constraints whatsoever m_constraints = (wxLayoutConstraints *) NULL; @@ -177,11 +194,17 @@ wxWindowBase::wxWindowBase() m_virtualSize = wxDefaultSize; m_minVirtualWidth = + m_maxVirtualWidth = wxDefaultCoord; m_minVirtualHeight = - m_maxVirtualWidth = - m_maxVirtualHeight = -1; + m_maxVirtualHeight = wxDefaultCoord; 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; @@ -212,7 +235,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, // ids are limited to 16 bits under MSW so if you care about portability, // it's not a good idea to use ids out of this range (and negative ids are - // reserved for wxWindows own usage) + // reserved for wxWidgets own usage) wxASSERT_MSG( id == wxID_ANY || (id >= 0 && id < 32767), _T("invalid id value") ); @@ -367,6 +390,7 @@ void wxWindowBase::Centre(int direction) int widthParent, heightParent; wxWindow *parent = NULL; + wxTopLevelWindow *winTop = NULL; if ( !(direction & wxCENTRE_ON_SCREEN) ) { @@ -388,9 +412,10 @@ void wxWindowBase::Centre(int direction) // 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() ) { + winTop = NULL; parent = NULL; } } @@ -413,11 +438,16 @@ void wxWindowBase::Centre(int direction) { 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 { @@ -429,8 +459,8 @@ void wxWindowBase::Centre(int direction) int width, height; GetSize(&width, &height); - int xNew = -1, - yNew = -1; + int xNew = wxDefaultCoord, + yNew = wxDefaultCoord; if ( direction & wxHORIZONTAL ) xNew = (widthParent - width)/2; @@ -442,9 +472,8 @@ void wxWindowBase::Centre(int direction) 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 @@ -452,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 (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 (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 - // 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 - // 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); } @@ -479,7 +508,7 @@ void wxWindowBase::Fit() { if ( GetChildren().GetCount() > 0 ) { - SetClientSize(DoGetBestSize()); + SetClientSize(GetBestSize()); } //else: do nothing if we have no children } @@ -493,6 +522,34 @@ 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 + // 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 { @@ -537,9 +594,13 @@ wxSize wxWindowBase::DoGetBestSize() const return wxSize(maxX, maxY); } #endif // wxUSE_CONSTRAINTS - else if ( GetChildren().GetCount() > 0 ) + else if ( !GetChildren().empty() +#ifdef __WXMAC__ + && wxHasRealChildren(this) +#endif + ) { - // our minimal acceptable size is such that all our windows fit inside + // our minimal acceptable size is such that all our visible child windows fit inside int maxX = 0, maxY = 0; @@ -548,7 +609,7 @@ wxSize wxWindowBase::DoGetBestSize() const node = node->GetNext() ) { wxWindow *win = node->GetData(); - if ( win->IsTopLevel() + if ( win->IsTopLevel() || ( ! win->IsShown() ) #if wxUSE_STATUSBAR || wxDynamicCast(win, wxStatusBar) #endif // wxUSE_STATUSBAR @@ -565,9 +626,9 @@ wxSize wxWindowBase::DoGetBestSize() const // if the window hadn't been positioned yet, assume that it is in // the origin - if ( wx == -1 ) + if ( wx == wxDefaultCoord ) wx = 0; - if ( wy == -1 ) + if ( wy == wxDefaultCoord ) wy = 0; win->GetSize(&ww, &wh); @@ -584,23 +645,47 @@ wxSize wxWindowBase::DoGetBestSize() const return wxSize(maxX, maxY); } - else + else // ! has children { - // Windows which don't implement DoGetBestSize and aren't parents. - // This emulates the behavior of a wxSizer without wxADJUST_MINSIZE + // for a generic window there is no natural best size - just use either the + // minimum size if there is one, or the current size + if ( GetMinSize().IsFullySpecified() ) + return GetMinSize(); + else + return GetSize(); + } +} - // If you get the following message you should do one of two things - // 1. Do what it says (best) - // 2. m_bestSize = GetSize() at end of Create() (hack) - if(m_bestSize == wxDefaultSize) - { - wxLogDebug(wxT("Class %s (or superclass) should implement DoGetBestSize()"),GetClassInfo()->GetClassName()); - wxConstCast(this,wxWindowBase)->m_bestSize = GetSize(); - } - return m_bestSize; + +wxSize wxWindowBase::GetBestFittingSize() const +{ + // merge the best size with the min size, giving priority to the min size + wxSize min = GetMinSize(); + if (min.x == wxDefaultCoord || min.y == wxDefaultCoord) + { + wxSize best = GetBestSize(); + if (min.x == wxDefaultCoord) min.x = best.x; + if (min.y == wxDefaultCoord) min.y = best.y; } + return min; } + +void wxWindowBase::SetBestFittingSize(const wxSize& size) +{ + // Set the min size to the size passed in. This will usually either be + // wxDefaultSize or the size passed to this window's ctor/Create function. + SetMinSize(size); + + // Merge the size with the best size if needed + wxSize best = GetBestFittingSize(); + + // If the current size doesn't match then change it + if (GetSize() != best) + SetSize(best); +} + + // by default the origin is not shifted wxPoint wxWindowBase::GetClientAreaOrigin() const { @@ -608,14 +693,14 @@ wxPoint wxWindowBase::GetClientAreaOrigin() const } // 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 - wxCHECK_RET( (minW == -1 || maxW == -1 || minW <= maxW) && - (minH == -1 || maxH == -1 || minH <= maxH), + wxCHECK_RET( (minW == wxDefaultCoord || maxW == wxDefaultCoord || minW <= maxW) && + (minH == wxDefaultCoord || maxH == wxDefaultCoord || minH <= maxH), _T("min width/height must be less than max width/height!") ); m_minWidth = minW; @@ -680,13 +765,13 @@ void wxWindowBase::SetVirtualSizeHints( int minW, int minH, void wxWindowBase::DoSetVirtualSize( int x, int y ) { - if ( m_minVirtualWidth != -1 && m_minVirtualWidth > x ) + if ( m_minVirtualWidth != wxDefaultCoord && m_minVirtualWidth > x ) x = m_minVirtualWidth; - if ( m_maxVirtualWidth != -1 && m_maxVirtualWidth < x ) + if ( m_maxVirtualWidth != wxDefaultCoord && m_maxVirtualWidth < x ) x = m_maxVirtualWidth; - if ( m_minVirtualHeight != -1 && m_minVirtualHeight > y ) + if ( m_minVirtualHeight != wxDefaultCoord && m_minVirtualHeight > y ) y = m_minVirtualHeight; - if ( m_maxVirtualHeight != -1 && m_maxVirtualHeight < y ) + if ( m_maxVirtualHeight != wxDefaultCoord && m_maxVirtualHeight < y ) y = m_maxVirtualHeight; m_virtualSize = wxSize(x, y); @@ -880,6 +965,38 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler) // colours, fonts &c // ---------------------------------------------------------------------------- +void wxWindowBase::InheritAttributes() +{ + const wxWindowBase * const parent = GetParent(); + if ( !parent ) + return; + + // 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()); + + // 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()); + + // 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 + } +} + /* static */ wxVisualAttributes wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { @@ -904,17 +1021,16 @@ wxColour wxWindowBase::GetBackgroundColour() const // we must return some valid colour to avoid redoing this every time // and also to avoid surprizing the applications written for older - // wxWindows versions where GetBackgroundColour() always returned + // 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; - // 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 @@ -929,33 +1045,36 @@ wxColour wxWindowBase::GetForegroundColour() const 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 ) { - if ( !colour.Ok() || (colour == m_backgroundColour) ) + if ( colour == m_backgroundColour ) 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 ) { - if ( !colour.Ok() || (colour == m_foregroundColour) ) + if (colour == m_foregroundColour ) return false; + m_hasFgCol = colour.Ok(); + m_inheritFgCol = m_hasFgCol; m_foregroundColour = colour; - - m_hasFgCol = true; - + SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() ); return true; } @@ -974,7 +1093,7 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor) return true; } -wxFont& wxWindowBase::DoGetFont() const +wxFont wxWindowBase::GetFont() const { // logic is the same as in GetBackgroundColour() if ( !m_font.Ok() ) @@ -985,18 +1104,14 @@ wxFont& wxWindowBase::DoGetFont() const 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) { - if ( !font.Ok() ) - return false; - if ( font == m_font ) { // no change @@ -1004,8 +1119,10 @@ bool wxWindowBase::SetFont(const wxFont& font) } m_font = font; + m_hasFont = font.Ok(); + m_inheritFont = m_hasFont; - m_hasFont = true; + InvalidateBestSize(); return true; } @@ -1111,7 +1228,7 @@ void wxWindowBase::ClearBackground() // 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; @@ -1127,7 +1244,7 @@ wxWindow *wxWindowBase::FindWindow( long id ) return (wxWindow *)res; } -wxWindow *wxWindowBase::FindWindow( const wxString& name ) +wxWindow *wxWindowBase::FindWindow(const wxString& name) const { if ( name == m_windowName ) return (wxWindow *)this; @@ -1604,6 +1721,19 @@ void wxWindowBase::SetSizerAndFit(wxSizer *sizer, bool deleteOld) 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() @@ -1803,22 +1933,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h) wxLayoutConstraints *constr = GetConstraints(); if ( constr ) { - if ( x != -1 ) + if ( x != wxDefaultCoord ) { constr->left.SetValue(x); constr->left.SetDone(true); } - if ( y != -1 ) + if ( y != wxDefaultCoord ) { constr->top.SetValue(y); constr->top.SetDone(true); } - if ( w != -1 ) + if ( w != wxDefaultCoord ) { constr->width.SetValue(w); constr->width.SetDone(true); } - if ( h != -1 ) + if ( h != wxDefaultCoord ) { constr->height.SetValue(h); constr->height.SetDone(true); @@ -1831,12 +1961,12 @@ void wxWindowBase::MoveConstraint(int x, int y) wxLayoutConstraints *constr = GetConstraints(); if ( constr ) { - if ( x != -1 ) + if ( x != wxDefaultCoord ) { constr->left.SetValue(x); constr->left.SetDone(true); } - if ( y != -1 ) + if ( y != wxDefaultCoord ) { constr->top.SetValue(y); constr->top.SetDone(true); @@ -1905,7 +2035,7 @@ void wxWindowBase::AdjustForParentClientOrigin(int& x, int& y, int sizeFlags) co void wxWindowBase::UpdateWindowUI(long flags) { wxUpdateUIEvent event(GetId()); - event.m_eventObject = this; + event.SetEventObject(this); if ( GetEventHandler()->ProcessEvent(event) ) { @@ -1942,12 +2072,16 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) 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 ( event.GetSetChecked() ) - checkbox->SetValue(event.GetChecked()); + checkbox->SetValue(event.GetChecked()); } #endif // wxUSE_CHECKBOX @@ -1955,12 +2089,10 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) wxRadioButton *radiobtn = wxDynamicCastThis(wxRadioButton); if ( radiobtn ) { - if ( event.GetSetChecked() ) - radiobtn->SetValue(event.GetChecked()); + radiobtn->SetValue(event.GetChecked()); } #endif // wxUSE_RADIOBTN } -#endif } #if 0 @@ -1988,10 +2120,10 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) { 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); - if (pt.y != -1) + if (pt.y != wxDefaultCoord) pt2.y = (int) ((pt.y * 8) / charHeight); return pt2; @@ -2001,10 +2133,10 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) { 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); - if (pt.y != -1) + if (pt.y != wxDefaultCoord) pt2.y = (int) ((pt.y * charHeight) / 8); return pt2; @@ -2025,12 +2157,14 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event) if ( !win->IsTopLevel() ) { wxSysColourChangedEvent event2; - event.m_eventObject = win; + event.SetEventObject(win); win->GetEventHandler()->ProcessEvent(event2); } node = node->GetNext(); } + + Refresh(); } // the default action is to populate dialog with data when it's created, @@ -2084,7 +2218,7 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) wxMessageBox(wxString::Format( _T( - " wxWindows Library (%s port)\nVersion %u.%u.%u%s, compiled at %s %s\n Copyright (c) 1995-2002 wxWindows team" + " wxWidgets Library (%s port)\nVersion %u.%u.%u%s%s, compiled at %s %s\n Copyright (c) 1995-2004 wxWidgets team" ), port.c_str(), wxMAJOR_VERSION, @@ -2094,11 +2228,16 @@ void wxWindowBase::OnMiddleClick( wxMouseEvent& event ) L" (Unicode)", #else "", +#endif +#ifdef __WXDEBUG__ + _T(" Debug build"), +#else + _T(""), #endif __TDATE__, __TTIME__ ), - _T("wxWindows information"), + _T("wxWidgets information"), wxICON_INFORMATION | wxOK, (wxWindow *)this); } @@ -2317,6 +2456,68 @@ bool wxWindowBase::TryParent(wxEvent& 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 // ---------------------------------------------------------------------------- @@ -2479,20 +2680,22 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name) 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 - // accessible classes, one for each kind of wxWindows + // accessible classes, one for each kind of wxWidgets // control or window. +#if wxUSE_BUTTON if (GetWindow()->IsKindOf(CLASSINFO(wxButton))) title = ((wxButton*) GetWindow())->GetLabel(); else +#endif title = GetWindow()->GetName(); - if (!title.IsEmpty()) + if (!title.empty()) { *name = title; return wxACC_OK; @@ -2598,7 +2801,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* return wxACC_FAIL; wxString ht(GetWindow()->GetHelpText()); - if (!ht.IsEmpty()) + if (!ht.empty()) { *description = ht; return wxACC_OK; @@ -2614,7 +2817,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* hel return wxACC_FAIL; wxString ht(GetWindow()->GetHelpText()); - if (!ht.IsEmpty()) + if (!ht.empty()) { *helpText = ht; return wxACC_OK; @@ -2640,7 +2843,7 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role) 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; @@ -2672,7 +2875,7 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state) 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; @@ -2734,7 +2937,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** // 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")