commit 0618858e0f4ecd65dbefad7f55254ff4a93e42d6
Author: mbarbon <mbarbon@2e9104e8-d5c8-4c90-bb67-bfd1792b7337>
Date:   Sat Mar 19 10:56:08 2011 +0000

      Compilation fix for wxWidgets 2.9.x/Cocoa.
    
    git-svn-id: https://wxperl.svn.sourceforge.net/svnroot/wxperl/wxPerl/trunk@3037 2e9104e8-d5c8-4c90-bb67-bfd1792b7337

diff --git a/XS/ComboBox.xs b/XS/ComboBox.xs
index f71d6f5..b85cdaa 100644
--- a/XS/ComboBox.xs
+++ b/XS/ComboBox.xs
@@ -5,7 +5,7 @@
 ## Modified by:
 ## Created:     31/10/2000
 ## RCS-ID:      $Id$
-## Copyright:   (c) 2000-2004, 2006-2008, 2010 Mattia Barbon
+## Copyright:   (c) 2000-2004, 2006-2008, 2010-2011 Mattia Barbon
 ## Licence:     This program is free software; you can redistribute it and/or
 ##              modify it under the same terms as Perl itself
 #############################################################################
@@ -89,7 +89,9 @@ wxComboBox::Create( parent, id = wxID_ANY, value = wxEmptyString, pos = wxDefaul
 
 INCLUDE_COMMAND: $^X -pe "s/ItemContainerImmutable/ComboBox/g" XS/ItemContainerImmutable.xs
 
-INCLUDE_COMMAND: $^X -pe "s/ItemContainer/ComboBox/g" XS/ItemContainer.xs
+# the second regex is an horrible hack to solve ambiguity;
+# see also OwnerDrawnComboBox.xsp
+INCLUDE_COMMAND: $^X -pe "s/ItemContainer/ComboBox/g;s/->(?=[SG]etClientObject)/->wxItemContainer::/" XS/ItemContainer.xs
 
 #undef WXPERL_IN_COMBOBOX