make it non mach-o carbon savvy

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2004-05-23 11:07:53 +00:00
parent f697130ea2
commit c829d62b69

View File

@ -17,9 +17,11 @@
#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
#endif
#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
#if TARGET_API_MAC_OSX
#define USE_HICOMBOBOX 1 //use hi combobox define
#else
#define USE_HICOMBOBOX 0
#endif
static int nextPopUpMenuId = 1000 ;
MenuHandle NewUniqueMenu()