make it non mach-o carbon savvy

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

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 853a335aa541c2c0f5353ca299c6b748a1390185..8f1e122bd0384facebe895b18c9dbc412312c318 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -17,9 +17,11 @@
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"
 #include "wx/button.h"
 #include "wx/menu.h"
 #include "wx/mac/uma.h"

+#if TARGET_API_MAC_OSX

 #ifndef __HIVIEW__
        #include <HIToolbox/HIView.h>
 #endif
 #ifndef __HIVIEW__
        #include <HIToolbox/HIView.h>
 #endif

+#endif

 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)


@@ -27,7 +29,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 
 
 // composite combobox implementation by Dan "Bud" Keith bud@otsys.com
 

+#if TARGET_API_MAC_OSX

 #define USE_HICOMBOBOX 1 //use hi combobox define
 #define USE_HICOMBOBOX 1 //use hi combobox define

+#else
+#define USE_HICOMBOBOX 0
+#endif

 
 static int nextPopUpMenuId = 1000 ;
 MenuHandle NewUniqueMenu() 
 
 static int nextPopUpMenuId = 1000 ;
 MenuHandle NewUniqueMenu()