fixed a memory leak and an initialization problem

[wxWidgets.git] / src / mac / carbon / combobox.cpp

diff --git a/src/mac/carbon/combobox.cpp b/src/mac/carbon/combobox.cpp
index a1410b113595afaeccb6dc4ee93aba7f9e69c4bb..5dabd2dd49f5ea1d989432c838fc7d91331d04fa 100644 (file)
--- 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() ;