changed wxSystemSettings::HasFrameDecorations to more general GetCapability(index)

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

diff --git a/src/mac/choice.cpp b/src/mac/choice.cpp
index 67aee1e9283c6ce7150168c3bc4c39dc471a520c..9f05a58372d946bde1aab048bb7edd1da4d49522 100644 (file)
--- a/src/mac/choice.cpp
+++ b/src/mac/choice.cpp
@@ -23,7 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 

-short nextMenuId = 100 ; // wxMenu takes the lower ids
+extern MenuHandle NewUniqueMenu() ;

 
 wxChoice::~wxChoice()
 {
 
 wxChoice::~wxChoice()
 {


@@ -45,10 +45,10 @@ 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 , false , 0 , -12345 , 0 , 
+               m_macControl = ::NewControl( parent->GetMacRootWindow() , &bounds , title , false , 0 , -12345 , 0 , 

                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;

                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , 0) ;


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

-    m_datas.Remove( n ) ;
+    m_datas.RemoveAt( n ) ;

        SetControlMaximum( m_macControl , GetCount()) ;
 }
 
        SetControlMaximum( m_macControl , GetCount()) ;
 }
 


@@ -216,6 +216,13 @@ void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }
     event.SetString(GetStringSelection());
     ProcessCommand(event);
 }

+
+wxSize wxChoice::DoGetBestSize() const
+{
+    // TODO should modify this to take into account string length ala wxGTK
+    return wxSize(100,20);
+}
+

 /*
 void wxChoice::Command(wxCommandEvent & event)
 {
 /*
 void wxChoice::Command(wxCommandEvent & event)
 {