X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33b3f7c34ac90609dd0c954c1a11397a21c15556..8787320bbd657237cb887bdfefab969a1b054dd5:/src/common/wincmn.cpp diff --git a/src/common/wincmn.cpp b/src/common/wincmn.cpp index 0b883ad106..14d868fdd8 100644 --- a/src/common/wincmn.cpp +++ b/src/common/wincmn.cpp @@ -17,7 +17,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "windowbase.h" #endif @@ -95,7 +95,7 @@ BEGIN_EVENT_TABLE(wxWindowBase, wxEvtHandler) EVT_MIDDLE_DOWN(wxWindowBase::OnMiddleClick) #if wxUSE_HELP - EVT_HELP(-1, wxWindowBase::OnHelp) + EVT_HELP(wxID_ANY, wxWindowBase::OnHelp) #endif // wxUSE_HELP END_EVENT_TABLE() @@ -109,11 +109,12 @@ END_EVENT_TABLE() // ---------------------------------------------------------------------------- // the default initialization -void wxWindowBase::InitBase() +wxWindowBase::wxWindowBase() +: m_bestSize(wxDefaultSize) { // no window yet, no parent nor children m_parent = (wxWindow *)NULL; - m_windowId = -1; + m_windowId = wxID_ANY; // no constraints on the minimal window size m_minWidth = @@ -121,9 +122,9 @@ void wxWindowBase::InitBase() m_maxWidth = m_maxHeight = -1; - // window is created enabled but it's not visible yet - m_isShown = FALSE; - m_isEnabled = TRUE; + // window are created enabled and visible by default + m_isShown = + m_isEnabled = true; // the default event handler is just this window m_eventHandler = this; @@ -133,23 +134,11 @@ void wxWindowBase::InitBase() m_windowValidator = (wxValidator *) NULL; #endif // wxUSE_VALIDATORS - // use the system default colours - m_backgroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); - m_foregroundColour = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); - - // don't set the font here for wxMSW as we don't call WM_SETFONT here and - // so the font is *not* really set - but calls to SetFont() later won't do - // anything because m_font appears to be already set! -#ifndef __WXMSW__ - m_font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); -#endif // __WXMSW__ - - // the colours/fonts are default for now + // the colours/fonts are default for now, so leave m_font, + // m_backgroundColour and m_foregroundColour uninitialized and set those m_hasBgCol = m_hasFgCol = - m_hasFont = FALSE; - - m_isBeingDeleted = FALSE; + m_hasFont = false; // no style bits m_exStyle = @@ -163,7 +152,7 @@ void wxWindowBase::InitBase() m_windowSizer = (wxSizer *) NULL; m_containingSizer = (wxSizer *) NULL; - m_autoLayout = FALSE; + m_autoLayout = false; #if wxUSE_DRAG_AND_DROP m_dropTarget = (wxDropTarget *)NULL; @@ -178,7 +167,7 @@ void wxWindowBase::InitBase() #endif // wxUSE_CARET #if wxUSE_PALETTE - m_hasCustomPalette = FALSE; + m_hasCustomPalette = false; #endif // wxUSE_PALETTE #if wxUSE_ACCESSIBILITY @@ -192,8 +181,13 @@ void wxWindowBase::InitBase() m_maxVirtualWidth = m_maxVirtualHeight = -1; + m_windowVariant = wxWINDOW_VARIANT_NORMAL; + // Whether we're using the current theme for this window (wxGTK only for now) - m_themeEnabled = FALSE; + m_themeEnabled = false; + + // VZ: this one shouldn't exist... + m_isBeingDeleted = false; } // common part of window creation process @@ -202,7 +196,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, const wxPoint& WXUNUSED(pos), const wxSize& WXUNUSED(size), long style, - const wxValidator& validator, + const wxValidator& wxVALIDATOR_PARAM(validator), const wxString& name) { #if wxUSE_STATBOX @@ -241,7 +235,7 @@ bool wxWindowBase::CreateBase(wxWindowBase *parent, SetExtraStyle(GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -266,14 +260,23 @@ wxWindowBase::~wxWindowBase() wxASSERT_MSG( GetChildren().GetCount() == 0, wxT("children not destroyed") ); + // reset the dangling pointer our parent window may keep to us + if ( m_parent ) + { + if ( m_parent->GetDefaultItem() == this ) + { + m_parent->SetDefaultItem(NULL); + } + + m_parent->RemoveChild(this); + } + #if wxUSE_CARET - if ( m_caret ) - delete m_caret; + delete m_caret; #endif // wxUSE_CARET #if wxUSE_VALIDATORS - if ( m_windowValidator ) - delete m_windowValidator; + delete m_windowValidator; #endif // wxUSE_VALIDATORS #if wxUSE_CONSTRAINTS @@ -289,54 +292,40 @@ wxWindowBase::~wxWindowBase() delete m_constraints; m_constraints = NULL; } - #endif // wxUSE_CONSTRAINTS if ( m_containingSizer ) m_containingSizer->Detach( (wxWindow*)this ); - if ( m_windowSizer ) - delete m_windowSizer; + delete m_windowSizer; #if wxUSE_DRAG_AND_DROP - if ( m_dropTarget ) - delete m_dropTarget; + delete m_dropTarget; #endif // wxUSE_DRAG_AND_DROP #if wxUSE_TOOLTIPS - if ( m_tooltip ) - delete m_tooltip; + delete m_tooltip; #endif // wxUSE_TOOLTIPS #if wxUSE_ACCESSIBILITY - if ( m_accessible ) - delete m_accessible; + delete m_accessible; #endif - - // reset the dangling pointer our parent window may keep to us - if ( m_parent && m_parent->GetDefaultItem() == this ) - { - m_parent->SetDefaultItem(NULL); - } } bool wxWindowBase::Destroy() { delete this; - return TRUE; + return true; } bool wxWindowBase::Close(bool force) { wxCloseEvent event(wxEVT_CLOSE_WINDOW, m_windowId); event.SetEventObject(this); -#if WXWIN_COMPATIBILITY - event.SetForce(force); -#endif // WXWIN_COMPATIBILITY event.SetCanVeto(!force); - // return FALSE if window wasn't closed because the application vetoed the + // return false if window wasn't closed because the application vetoed the // close event return GetEventHandler()->ProcessEvent(event) && !event.GetVeto(); } @@ -353,16 +342,17 @@ bool wxWindowBase::DestroyChildren() wxWindow *child = node->GetData(); - wxASSERT_MSG( child, wxT("children list contains empty nodes") ); - - child->Show(FALSE); + // note that we really want to call delete and not ->Destroy() here + // because we want to delete the child immediately, before we are + // deleted, and delayed deletion would result in problems as our (top + // level) child could outlive its parent delete child; wxASSERT_MSG( !GetChildren().Find(child), wxT("child didn't remove itself using RemoveChild()") ); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -596,9 +586,18 @@ wxSize wxWindowBase::DoGetBestSize() const } else { - // for a generic window there is no natural best size - just use the - // current one - return GetSize(); + // Windows which don't implement DoGetBestSize and aren't parents. + // This emulates the behavior of a wxSizer without wxADJUST_MINSIZE + + // 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; } } @@ -625,6 +624,51 @@ void wxWindowBase::SetSizeHints(int minW, int minH, m_maxHeight = maxH; } +void wxWindowBase::SetWindowVariant( wxWindowVariant variant ) +{ + if ( m_windowVariant != variant ) + { + m_windowVariant = variant; + + DoSetWindowVariant(variant); + } +} + +void wxWindowBase::DoSetWindowVariant( wxWindowVariant variant ) +{ + // adjust the font height to correspond to our new variant (notice that + // we're only called if something really changed) + wxFont font = GetFont(); + int size = font.GetPointSize(); + switch ( variant ) + { + case wxWINDOW_VARIANT_NORMAL: + break; + + case wxWINDOW_VARIANT_SMALL: + size *= 3; + size /= 4; + break; + + case wxWINDOW_VARIANT_MINI: + size *= 2; + size /= 3; + break; + + case wxWINDOW_VARIANT_LARGE: + size *= 5; + size /= 4; + break; + + default: + wxFAIL_MSG(_T("unexpected window variant")); + break; + } + + font.SetPointSize(size); + SetFont(font); +} + void wxWindowBase::SetVirtualSizeHints( int minW, int minH, int maxW, int maxH ) { @@ -666,11 +710,11 @@ bool wxWindowBase::Show(bool show) { m_isShown = show; - return TRUE; + return true; } else { - return FALSE; + return false; } } @@ -680,11 +724,11 @@ bool wxWindowBase::Enable(bool enable) { m_isEnabled = enable; - return TRUE; + return true; } else { - return FALSE; + return false; } } // ---------------------------------------------------------------------------- @@ -693,7 +737,7 @@ bool wxWindowBase::Enable(bool enable) bool wxWindowBase::IsTopLevel() const { - return FALSE; + return false; } // ---------------------------------------------------------------------------- @@ -727,7 +771,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent) if ( newParent == oldParent ) { // nothing done - return FALSE; + return false; } // unlink this window from the existing parent. @@ -750,7 +794,7 @@ bool wxWindowBase::Reparent(wxWindowBase *newParent) wxTopLevelWindows.Append((wxWindow *)this); } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -793,7 +837,7 @@ wxEvtHandler *wxWindowBase::PopEventHandler(bool deleteHandler) bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler) { - wxCHECK_MSG( handler, FALSE, _T("RemoveEventHandler(NULL) called") ); + wxCHECK_MSG( handler, false, _T("RemoveEventHandler(NULL) called") ); wxEvtHandler *handlerPrev = NULL, *handlerCur = GetEventHandler(); @@ -816,9 +860,11 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler) { handlerNext->SetPreviousHandler ( handlerPrev ); } + handler->SetNextHandler(NULL); + handler->SetPreviousHandler(NULL); - return TRUE; + return true; } handlerPrev = handlerCur; @@ -827,35 +873,90 @@ bool wxWindowBase::RemoveEventHandler(wxEvtHandler *handler) wxFAIL_MSG( _T("where has the event handler gone?") ); - return FALSE; + return false; } // ---------------------------------------------------------------------------- -// cursors, fonts &c +// colours, fonts &c // ---------------------------------------------------------------------------- +/* static */ wxVisualAttributes +wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + // it is important to return valid values for all attributes from here, + // GetXXX() below rely on this + wxVisualAttributes attrs; + attrs.font = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT); + attrs.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT); + attrs.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE); + + return attrs; +} + +wxColour wxWindowBase::GetBackgroundColour() const +{ + if ( !m_backgroundColour.Ok() ) + { + wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") ); + + // get our default background colour + wxColour colBg = GetDefaultAttributes().colBg; + + // we must return some valid colour to avoid redoing this every time + // and also to avoid surprizing the applications written for older + // wxWindows 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 m_backgroundColour; +} + +wxColour wxWindowBase::GetForegroundColour() const +{ + // logic is the same as above + if ( !m_hasFgCol && !m_foregroundColour.Ok() ) + { + wxASSERT_MSG( !m_hasFgCol, _T("we have invalid explicit fg colour?") ); + + wxColour colFg = GetDefaultAttributes().colFg; + + if ( !colFg.Ok() ) + colFg = GetClassDefaultAttributes().colFg; + + wxConstCast(this, wxWindowBase)->m_foregroundColour = colFg; + } + + return m_foregroundColour; +} + bool wxWindowBase::SetBackgroundColour( const wxColour &colour ) { if ( !colour.Ok() || (colour == m_backgroundColour) ) - return FALSE; + return false; m_backgroundColour = colour; - m_hasBgCol = TRUE; + m_hasBgCol = true; - return TRUE; + return true; } bool wxWindowBase::SetForegroundColour( const wxColour &colour ) { if ( !colour.Ok() || (colour == m_foregroundColour) ) - return FALSE; + return false; m_foregroundColour = colour; - m_hasFgCol = TRUE; + m_hasFgCol = true; - return TRUE; + return true; } bool wxWindowBase::SetCursor(const wxCursor& cursor) @@ -865,37 +966,55 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor) if ( m_cursor == cursor ) { // no change - return FALSE; + return false; } m_cursor = cursor; - return TRUE; + return true; +} + +wxFont& wxWindowBase::DoGetFont() const +{ + // logic is the same as in GetBackgroundColour() + if ( !m_font.Ok() ) + { + wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") ); + + wxFont font = GetDefaultAttributes().font; + if ( !font.Ok() ) + font = GetClassDefaultAttributes().font; + + wxConstCast(this, wxWindowBase)->m_font = font; + } + + // cast is here for non-const GetFont() convenience + return wxConstCast(this, wxWindowBase)->m_font; } 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; + if ( !font.Ok() ) + return false; - if ( fontOk == m_font ) + if ( font == m_font ) { // no change - return FALSE; + return false; } - m_font = fontOk; + m_font = font; - m_hasFont = TRUE; + m_hasFont = true; - return TRUE; + return true; } #if wxUSE_PALETTE void wxWindowBase::SetPalette(const wxPalette& pal) { - m_hasCustomPalette = TRUE; + m_hasCustomPalette = true; m_palette = pal; // VZ: can anyone explain me what do we do here? @@ -947,7 +1066,7 @@ void wxWindowBase::SetValidator(const wxValidator& validator) m_windowValidator = (wxValidator *)validator.Clone(); if ( m_windowValidator ) - m_windowValidator->SetWindow(this) ; + m_windowValidator->SetWindow(this); } #endif // wxUSE_VALIDATORS @@ -977,6 +1096,17 @@ bool wxWindowBase::IsExposed(int x, int y, int w, int h) const return m_updateRegion.Contains(x, y, w, h) != wxOutRegion; } +void wxWindowBase::ClearBackground() +{ + // wxGTK uses its own version, no need to add never used code +#ifndef __WXGTK__ + wxClientDC dc((wxWindow *)this); + wxBrush brush(GetBackgroundColour(), wxSOLID); + dc.SetBackground(brush); + dc.Clear(); +#endif // __WXGTK__ +} + // ---------------------------------------------------------------------------- // find child window by id or name // ---------------------------------------------------------------------------- @@ -1165,17 +1295,17 @@ bool wxWindowBase::Validate() wxValidator *validator = child->GetValidator(); if ( validator && !validator->Validate((wxWindow *)this) ) { - return FALSE; + return false; } if ( recurse && !child->Validate() ) { - return FALSE; + return false; } } #endif // wxUSE_VALIDATORS - return TRUE; + return true; } bool wxWindowBase::TransferDataToWindow() @@ -1195,7 +1325,7 @@ bool wxWindowBase::TransferDataToWindow() wxLog::FlushActive(); #endif // wxUSE_LOG - return FALSE; + return false; } if ( recurse ) @@ -1203,13 +1333,13 @@ bool wxWindowBase::TransferDataToWindow() if ( !child->TransferDataToWindow() ) { // warning already given - return FALSE; + return false; } } } #endif // wxUSE_VALIDATORS - return TRUE; + return true; } bool wxWindowBase::TransferDataFromWindow() @@ -1227,7 +1357,7 @@ bool wxWindowBase::TransferDataFromWindow() // nop warning here because the application is supposed to give // one itself - we don't know here what might have gone wrongly - return FALSE; + return false; } if ( recurse ) @@ -1235,13 +1365,13 @@ bool wxWindowBase::TransferDataFromWindow() if ( !child->TransferDataFromWindow() ) { // warning already given - return FALSE; + return false; } } } #endif // wxUSE_VALIDATORS - return TRUE; + return true; } void wxWindowBase::InitDialog() @@ -1457,6 +1587,9 @@ void wxWindowBase::DeleteRelatedConstraints() void wxWindowBase::SetSizer(wxSizer *sizer, bool deleteOld) { + if ( sizer == m_windowSizer) + return; + if ( deleteOld ) delete m_windowSizer; @@ -1515,7 +1648,7 @@ bool wxWindowBase::Layout() } #endif - return TRUE; + return true; } #if wxUSE_CONSTRAINTS @@ -1539,7 +1672,7 @@ bool wxWindowBase::LayoutPhase2(int *noChanges) // Layout grand children DoPhase(2); - return TRUE; + return true; } // Do a phase of evaluating child constraints @@ -1593,7 +1726,7 @@ bool wxWindowBase::DoPhase(int phase) } } - return TRUE; + return true; } void wxWindowBase::ResetConstraints() @@ -1601,14 +1734,14 @@ void wxWindowBase::ResetConstraints() wxLayoutConstraints *constr = GetConstraints(); if ( constr ) { - constr->left.SetDone(FALSE); - constr->top.SetDone(FALSE); - constr->right.SetDone(FALSE); - constr->bottom.SetDone(FALSE); - constr->width.SetDone(FALSE); - constr->height.SetDone(FALSE); - constr->centreX.SetDone(FALSE); - constr->centreY.SetDone(FALSE); + constr->left.SetDone(false); + constr->top.SetDone(false); + constr->right.SetDone(false); + constr->bottom.SetDone(false); + constr->width.SetDone(false); + constr->height.SetDone(false); + constr->centreX.SetDone(false); + constr->centreY.SetDone(false); } wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); @@ -1673,22 +1806,22 @@ void wxWindowBase::SetSizeConstraint(int x, int y, int w, int h) if ( x != -1 ) { constr->left.SetValue(x); - constr->left.SetDone(TRUE); + constr->left.SetDone(true); } if ( y != -1 ) { constr->top.SetValue(y); - constr->top.SetDone(TRUE); + constr->top.SetDone(true); } if ( w != -1 ) { constr->width.SetValue(w); - constr->width.SetDone(TRUE); + constr->width.SetDone(true); } if ( h != -1 ) { constr->height.SetValue(h); - constr->height.SetDone(TRUE); + constr->height.SetDone(true); } } } @@ -1701,12 +1834,12 @@ void wxWindowBase::MoveConstraint(int x, int y) if ( x != -1 ) { constr->left.SetValue(x); - constr->left.SetDone(TRUE); + constr->left.SetDone(true); } if ( y != -1 ) { constr->top.SetValue(y); - constr->top.SetDone(TRUE); + constr->top.SetDone(true); } } } @@ -1799,7 +1932,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) { if ( event.GetSetEnabled() ) Enable(event.GetEnabled()); - + #if wxUSE_CONTROLS if ( event.GetSetText() ) { @@ -1826,7 +1959,7 @@ void wxWindowBase::DoUpdateWindowUI(wxUpdateUIEvent& event) radiobtn->SetValue(event.GetChecked()); } #endif // wxUSE_RADIOBTN - } + } #endif } @@ -1857,9 +1990,9 @@ wxPoint wxWindowBase::ConvertPixelsToDialog(const wxPoint& pt) int charHeight = GetCharHeight(); wxPoint pt2(-1, -1); if (pt.x != -1) - pt2.x = (int) ((pt.x * 4) / charWidth) ; + pt2.x = (int) ((pt.x * 4) / charWidth); if (pt.y != -1) - pt2.y = (int) ((pt.y * 8) / charHeight) ; + pt2.y = (int) ((pt.y * 8) / charHeight); return pt2; } @@ -1870,9 +2003,9 @@ wxPoint wxWindowBase::ConvertDialogToPixels(const wxPoint& pt) int charHeight = GetCharHeight(); wxPoint pt2(-1, -1); if (pt.x != -1) - pt2.x = (int) ((pt.x * charWidth) / 4) ; + pt2.x = (int) ((pt.x * charWidth) / 4); if (pt.y != -1) - pt2.y = (int) ((pt.y * charHeight) / 8) ; + pt2.y = (int) ((pt.y * charHeight) / 8); return pt2; } @@ -1906,7 +2039,7 @@ void wxWindowBase::OnSysColourChanged(wxSysColourChangedEvent& event) void wxWindowBase::OnInitDialog( wxInitDialogEvent &WXUNUSED(event) ) { TransferDataToWindow(); - + // Update the UI at this point UpdateWindowUI(wxUPDATE_UI_RECURSE); } @@ -2106,8 +2239,8 @@ void wxWindowBase::ReleaseMouse() //else: stack is empty, no previous capture wxLogTrace(_T("mousecapture"), - _T("After ReleaseMouse() mouse is captured by %p"), - GetCapture()); + (const wxChar *) _T("After ReleaseMouse() mouse is captured by %p"), + GetCapture()); } #if wxUSE_HOTKEY @@ -2141,10 +2274,9 @@ void wxWindowBase::SendDestroyEvent() // event processing // ---------------------------------------------------------------------------- -#if wxUSE_VALIDATORS - -bool wxWindowBase::TryValidator(wxEvent& event) +bool wxWindowBase::TryValidator(wxEvent& wxVALIDATOR_PARAM(event)) { +#if wxUSE_VALIDATORS // Can only use the validator of the window which // is receiving the event if ( event.GetEventObject() == this ) @@ -2152,15 +2284,14 @@ bool wxWindowBase::TryValidator(wxEvent& event) wxValidator *validator = GetValidator(); if ( validator && validator->ProcessEvent(event) ) { - return TRUE; + return true; } } +#endif // wxUSE_VALIDATORS - return FALSE; + return false; } -#endif // wxUSE_VALIDATORS - bool wxWindowBase::TryParent(wxEvent& event) { // carry on up the parent-child hierarchy if the propgation count hasn't @@ -2205,7 +2336,7 @@ wxWindow* wxGetTopLevelParent(wxWindow *win) // Can return either a child object, or an integer // representing the child element, starting from 1. -wxAccStatus wxWindowAccessible::HitTest(const wxPoint& pt, int* childId, wxAccessible** childObject) +wxAccStatus wxWindowAccessible::HitTest(const wxPoint& WXUNUSED(pt), int* WXUNUSED(childId), wxAccessible** WXUNUSED(childObject)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2230,7 +2361,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId) { if (elementId <= (int) GetWindow()->GetChildren().GetCount()) { - win = (wxWindow*) GetWindow()->GetChildren().Nth(elementId-1)->GetData(); + win = GetWindow()->GetChildren().Item(elementId-1)->GetData(); } else return wxACC_FAIL; @@ -2248,7 +2379,7 @@ wxAccStatus wxWindowAccessible::GetLocation(wxRect& rect, int elementId) // Navigates from fromId to toId/toObject. wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, - int* toId, wxAccessible** toObject) + int* WXUNUSED(toId), wxAccessible** toObject) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2278,7 +2409,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, case wxNAVDIR_DOWN: case wxNAVDIR_NEXT: { - wxWindowList::compatibility_iterator node = NULL; + wxWindowList::compatibility_iterator node = + wxWindowList::compatibility_iterator(); if (fromId == 0) { // Can't navigate to sibling of this window @@ -2296,7 +2428,7 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, if (node && node->GetNext()) { - wxWindow* nextWindow = (wxWindow*) node->GetNext()->Data(); + wxWindow* nextWindow = node->GetNext()->GetData(); *toObject = nextWindow->GetOrCreateAccessible(); return wxACC_OK; } @@ -2307,7 +2439,8 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, case wxNAVDIR_UP: case wxNAVDIR_PREVIOUS: { - wxWindowList::compatibility_iterator node = NULL; + wxWindowList::compatibility_iterator node = + wxWindowList::compatibility_iterator(); if (fromId == 0) { // Can't navigate to sibling of this window @@ -2325,7 +2458,7 @@ wxAccStatus wxWindowAccessible::Navigate(wxNavDir navDir, int fromId, if (node && node->GetPrevious()) { - wxWindow* previousWindow = (wxWindow*) node->GetPrevious()->Data(); + wxWindow* previousWindow = node->GetPrevious()->GetData(); *toObject = previousWindow->GetOrCreateAccessible(); return wxACC_OK; } @@ -2358,7 +2491,7 @@ wxAccStatus wxWindowAccessible::GetName(int childId, wxString* name) title = ((wxButton*) GetWindow())->GetLabel(); else title = GetWindow()->GetName(); - + if (!title.IsEmpty()) { *name = title; @@ -2398,7 +2531,7 @@ wxAccStatus wxWindowAccessible::GetChild(int childId, wxAccessible** child) if (childId > (int) GetWindow()->GetChildren().GetCount()) return wxACC_FAIL; - wxWindow* childWindow = (wxWindow*) GetWindow()->GetChildren().Nth(childId-1)->GetData(); + wxWindow* childWindow = GetWindow()->GetChildren().Item(childId-1)->GetData(); *child = childWindow->GetOrCreateAccessible(); if (*child) return wxACC_OK; @@ -2433,7 +2566,7 @@ wxAccStatus wxWindowAccessible::GetParent(wxAccessible** parent) // or > 0 (the action for a child). // Return wxACC_NOT_SUPPORTED if there is no default action for this // window (e.g. an edit control). -wxAccStatus wxWindowAccessible::DoDefaultAction(int childId) +wxAccStatus wxWindowAccessible::DoDefaultAction(int WXUNUSED(childId)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2448,7 +2581,7 @@ wxAccStatus wxWindowAccessible::DoDefaultAction(int childId) // The retrieved string describes the action that is performed on an object, // not what the object does as a result. For example, a toolbar button that prints // a document has a default action of "Press" rather than "Prints the current document." -wxAccStatus wxWindowAccessible::GetDefaultAction(int childId, wxString* actionName) +wxAccStatus wxWindowAccessible::GetDefaultAction(int WXUNUSED(childId), wxString* WXUNUSED(actionName)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2458,7 +2591,7 @@ wxAccStatus wxWindowAccessible::GetDefaultAction(int childId, wxString* actionNa } // Returns the description for this object or a child. -wxAccStatus wxWindowAccessible::GetDescription(int childId, wxString* description) +wxAccStatus wxWindowAccessible::GetDescription(int WXUNUSED(childId), wxString* description) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2474,7 +2607,7 @@ wxAccStatus wxWindowAccessible::GetDescription(int childId, wxString* descriptio } // Returns help text for this object or a child, similar to tooltip text. -wxAccStatus wxWindowAccessible::GetHelpText(int childId, wxString* helpText) +wxAccStatus wxWindowAccessible::GetHelpText(int WXUNUSED(childId), wxString* helpText) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2491,7 +2624,7 @@ wxAccStatus wxWindowAccessible::GetHelpText(int childId, wxString* helpText) // Returns the keyboard shortcut for this object or child. // Return e.g. ALT+K -wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int childId, wxString* shortcut) +wxAccStatus wxWindowAccessible::GetKeyboardShortcut(int WXUNUSED(childId), wxString* WXUNUSED(shortcut)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2527,7 +2660,9 @@ wxAccStatus wxWindowAccessible::GetRole(int childId, wxAccRole* role) *role = wxROLE_SYSTEM_CLIENT; return wxACC_OK; + #if 0 return wxACC_NOT_IMPLEMENTED; + #endif } // Returns a state constant. @@ -2557,12 +2692,14 @@ wxAccStatus wxWindowAccessible::GetState(int childId, long* state) *state = 0; return wxACC_OK; + #if 0 return wxACC_NOT_IMPLEMENTED; + #endif } // Returns a localized string representing the value for the object // or child. -wxAccStatus wxWindowAccessible::GetValue(int childId, wxString* strValue) +wxAccStatus wxWindowAccessible::GetValue(int WXUNUSED(childId), wxString* WXUNUSED(strValue)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2572,7 +2709,7 @@ wxAccStatus wxWindowAccessible::GetValue(int childId, wxString* strValue) } // Selects the object or child. -wxAccStatus wxWindowAccessible::Select(int childId, wxAccSelectionFlags selectFlags) +wxAccStatus wxWindowAccessible::Select(int WXUNUSED(childId), wxAccSelectionFlags WXUNUSED(selectFlags)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2585,7 +2722,7 @@ wxAccStatus wxWindowAccessible::Select(int childId, wxAccSelectionFlags selectFl // If childId is 0 and child is NULL, no object in // this subhierarchy has the focus. // If this object has the focus, child should be 'this'. -wxAccStatus wxWindowAccessible::GetFocus(int* childId, wxAccessible** child) +wxAccStatus wxWindowAccessible::GetFocus(int* WXUNUSED(childId), wxAccessible** WXUNUSED(child)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow()) @@ -2602,7 +2739,7 @@ wxAccStatus wxWindowAccessible::GetFocus(int* childId, wxAccessible** child) // - an integer representing the selected child element, // or 0 if this object is selected (GetType() == wxT("long") // - a "void*" pointer to a wxAccessible child object -wxAccStatus wxWindowAccessible::GetSelections(wxVariant* selections) +wxAccStatus wxWindowAccessible::GetSelections(wxVariant* WXUNUSED(selections)) { wxASSERT( GetWindow() != NULL ); if (!GetWindow())