From: Vadim Zeitlin Date: Tue, 6 Oct 2009 14:18:48 +0000 (+0000) Subject: Compilation fix for VC6 in wxInfoBarGeneric code. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/21d5ec7d6527671d2fadb17a522e3478c69d6d70 Compilation fix for VC6 in wxInfoBarGeneric code. VC6 apparently can't compare const pointer to derived class with a non-const pointer to the base class. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/generic/infobar.cpp b/src/generic/infobar.cpp index 2cc7b5e164..de16c788a3 100644 --- a/src/generic/infobar.cpp +++ b/src/generic/infobar.cpp @@ -170,10 +170,13 @@ wxInfoBarGeneric::BarPlacement wxInfoBarGeneric::GetBarPlacement() const if ( !sizer ) return BarPlacement_Unknown; + // FIXME-VC6: can't compare "const wxInfoBarGeneric *" and "wxWindow *", + // so need this workaround + wxWindow * const self = const_cast(this); const wxSizerItemList& siblings = sizer->GetChildren(); - if ( siblings.GetFirst()->GetData()->GetWindow() == this ) + if ( siblings.GetFirst()->GetData()->GetWindow() == self ) return BarPlacement_Top; - else if ( siblings.GetLast()->GetData()->GetWindow() == this ) + else if ( siblings.GetLast()->GetData()->GetWindow() == self ) return BarPlacement_Bottom; else return BarPlacement_Unknown;