From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 30 Jul 2011 11:30:03 +0000 (+0000)
Subject: Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c29c95fe24973b94fd724db767193171ca7c513d

Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

Use wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST for wxOSX/Cocoa too, not
only for wxOSX/Carbon. This macro adds methods to explicitly disambiguate
between the two inherited versions of each GetClientXXX() method, the one from
wxItemContainer and the other one from wxEvtHandler.

Closes #11637.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/osx/combobox.h b/include/wx/osx/combobox.h
index 8d875edd34..4a31de9135 100644
--- a/include/wx/osx/combobox.h
+++ b/include/wx/osx/combobox.h
@@ -144,9 +144,7 @@ class WXDLLIMPEXP_CORE wxComboBox :
 
     virtual bool        OSXHandleClicked( double timestampsec );
 
-#if wxOSX_USE_CARBON
     wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST
-#endif
 
 #if wxOSX_USE_COCOA
     wxComboWidgetImpl* GetComboPeer() const;