X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/892e461e3307b21676e9b0b0e588abc4e36dad31..6f36917bbffe00404ae6f653e876d57efc25a8ac:/src/mac/carbon/combobox.cpp diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp index a1410b1135..5dabd2dd49 100644 --- a/src/mac/carbon/combobox.cpp +++ b/src/mac/carbon/combobox.cpp @@ -23,7 +23,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl) // right now we don't support editable comboboxes -static nextPopUpMenuId = 1000 ; +static int nextPopUpMenuId = 1000 ; MenuHandle NewUniqueMenu() { MenuHandle handle = NewMenu( nextPopUpMenuId , "\pMenu" ) ; @@ -47,7 +47,7 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id, MacPreControlCreate( parent , id , "" , pos , size ,style, validator , name , &bounds , title ) ; - m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, + m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0, kControlPopupButtonProc , (long) this ) ; m_macPopUpMenuHandle = NewUniqueMenu() ;