Added code to show off wxDbGrid (contributed by Paul and Roger Gammans) in wxUSE_NEW_...

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 9363a6cdda1275826287db0c8a7e0a9f1e8b1984..73dfa522d3df73fd958705feb647509e7e891c04 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -44,7 +44,7 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 

-               m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , true , 0 , -12345 , 0 , 
+               m_macControl = UMANewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 

                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;


@@ -91,7 +91,8 @@ void wxChoice::Delete(int n)
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;
 
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     m_strings.Remove( n ) ;

-         SetControlMaximum( m_macControl , Number()) ;
+    m_datas.Remove( n ) ;
+       SetControlMaximum( m_macControl , Number()) ;

 }
 
 void wxChoice::Clear()
 }
 
 void wxChoice::Clear()


@@ -104,7 +105,7 @@ void wxChoice::Clear()
          }
     m_strings.Empty() ;
     m_datas.Empty() ;
          }
     m_strings.Empty() ;
     m_datas.Empty() ;

-         SetControlMaximum( m_macControl , 0 ) ;
+       SetControlMaximum( m_macControl , 0 ) ;

 }
 
 void wxChoice::Free()
 }
 
 void wxChoice::Free()