switched to MacOS 8.5+ implementation for submenus

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 0559853584c689fc3381eff7121132f3fd216b37..bc008702f43be2c29638fac049fa393aa2e53788 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -23,7 +23,7 @@
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 #endif
 
-short nextMenuId = 100 ; // wxMenu takes the lower ids
+extern MenuHandle NewUniqueMenu() ;
 
 wxChoice::~wxChoice()
 {
@@ -45,15 +45,15 @@ bool wxChoice::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( MAC_WXHWND(parent->MacGetRootWindow()) , &bounds , title , false , 0 , -12345 , 0 , 
                kControlPopupButtonProc + kControlPopupFixedWidthVariant , (long) this ) ; 
        
-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
-               SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , 0) ;
+               m_macPopUpMenuHandle =  NewUniqueMenu() ;
+               SetControlData( (ControlHandle) m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
+               SetControl32BitMinimum( (ControlHandle) m_macControl , 0 ) ;
+               SetControl32BitMaximum( (ControlHandle) m_macControl , 0) ;
                if ( n > 0 )
-                       SetControlValue( m_macControl , 1 ) ;
+                       SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;
 
                MacPostControlCreate() ;
 
@@ -72,12 +72,12 @@ int wxChoice::DoAppend(const wxString& item)
 {
        Str255 label;
        wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
-       AppendMenu( m_macPopUpMenuHandle , label ) ;
+       AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
        m_strings.Add( item ) ;
        m_datas.Add( NULL ) ;
        int index = m_strings.GetCount()  - 1  ;
        DoSetItemClientData( index , NULL ) ;
-       SetControlMaximum( m_macControl , GetCount()) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
        return index ;
 }
 
@@ -90,26 +90,26 @@ void wxChoice::Delete(int n)
         delete GetClientObject(n);
     }
 
-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
     m_strings.Remove( n ) ;
     m_datas.RemoveAt( n ) ;
-       SetControlMaximum( m_macControl , GetCount()) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
 }
 
 void wxChoice::Clear()
 {
-    Free();
+    FreeData();
 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-         }
+       ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+    }
     m_strings.Empty() ;
     m_datas.Empty() ;
-       SetControlMaximum( m_macControl , 0 ) ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
 }
 
-void wxChoice::Free()
+void wxChoice::FreeData()
 {
     if ( HasClientObjectData() )
     {
@@ -127,12 +127,12 @@ void wxChoice::Free()
 
 int wxChoice::GetSelection() const
 {
-    return GetControlValue( m_macControl ) -1 ;
+    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;
 }
 
 void wxChoice::SetSelection(int n)
 {
-    SetControlValue( m_macControl , n + 1 ) ;
+    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;
 }
 
 // ----------------------------------------------------------------------------
@@ -156,7 +156,7 @@ int wxChoice::FindString(const wxString& s) const
 
 void wxChoice::SetString(int n, const wxString& s)
 {
-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
@@ -176,26 +176,18 @@ wxString wxChoice::GetString(int n) const
 
 void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
-    wxCHECK_RET( n >= 0 && n < m_datas.GetCount(),
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
                  "invalid index in wxChoice::SetClientData" );
-       wxASSERT_MSG( m_datas.GetCount() >= n , "invalid client_data array" ) ;
        
-       if ( m_datas.GetCount() > n )
-       {
-       m_datas[n] = (char*) clientData ;
-    }
-    else
-    {
-       m_datas.Add( (char*) clientData ) ;
-    }
+    m_datas[n] = (char*) clientData ;
 }
 
-void *wxChoice::DoGetItemClientData(int N) const
+void *wxChoice::DoGetItemClientData(int n) const
 {
-    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
                  "invalid index in wxChoice::GetClientData" );
 
-    return (void *)m_datas[N];
+    return (void *)m_datas[n];
 }
 
 void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
@@ -208,7 +200,7 @@ wxClientData* wxChoice::DoGetItemClientObject( int n ) const
     return (wxClientData *)DoGetItemClientData(n);
 }
 
-void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
 {
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
          event.SetInt(GetSelection());
@@ -216,6 +208,13 @@ void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart
     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)
 {