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 343f3d239ebda7f1e14c6489559f5c0c09e34f8c..bc008702f43be2c29638fac049fa393aa2e53788 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -13,137 +13,212 @@
 #pragma implementation "choice.h"
 #endif
 
 #pragma implementation "choice.h"
 #endif
 

-// For compilers that support precompilation, includes "wx.h".
+#include "wx/defs.h"
+

 #include "wx/choice.h"
 #include "wx/choice.h"

+#include "wx/menu.h"

 #include "wx/mac/uma.h"
 
 #include "wx/mac/uma.h"
 

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)

+#endif
+
+extern MenuHandle NewUniqueMenu() ;
+
+wxChoice::~wxChoice()
+{
+       // DeleteMenu( m_macPopUpMenuId ) ;
+       // DisposeMenu( m_macPopUpMenuHandle ) ;
+}

 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,
 
 bool wxChoice::Create(wxWindow *parent, wxWindowID id,
            const wxPoint& pos,
            const wxSize& size,

-                               int n, const wxString choices[],
-                               long style,
+                  int n, const wxString choices[],
+                  long style,

            const wxValidator& validator,
            const wxString& name)
 {
            const wxValidator& validator,
            const wxString& name)
 {

-    m_noStrings = n;

 
                Rect bounds ;
                Str255 title ;
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;
 
                Rect bounds ;
                Str255 title ;
        
                MacPreControlCreate( parent , id ,  "" , pos , size ,style, validator , name , &bounds , title ) ;

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

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

-               m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
-               SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
-               for ( int i = 0 ; i < n ; i++ )
-               {
-                       appendmenu( m_macPopUpMenuHandle , choices[i] ) ;
-               }
-               SetControlMinimum( m_macControl , 0 ) ;
-               SetControlMaximum( m_macControl , m_noStrings) ;
-               SetControlValue( m_macControl , 1 ) ;
+               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 )
+                       SetControl32BitValue( (ControlHandle) m_macControl , 1 ) ;

 
                MacPostControlCreate() ;
 
 
                MacPostControlCreate() ;
 

+    for ( int i = 0; i < n; i++ )
+    {
+        Append(choices[i]);
+    }

        return TRUE;
 }
 
        return TRUE;
 }
 

-void wxChoice::Append(const wxString& item)
+// ----------------------------------------------------------------------------
+// adding/deleting items to/from the list
+// ----------------------------------------------------------------------------
+
+int wxChoice::DoAppend(const wxString& item)

 {
 {

-       appendmenu( m_macPopUpMenuHandle , item ) ;
-    m_noStrings ++;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+       Str255 label;
+       wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
+       AppendMenu( MAC_WXHMENU( m_macPopUpMenuHandle ) , label ) ;
+       m_strings.Add( item ) ;
+       m_datas.Add( NULL ) ;
+       int index = m_strings.GetCount()  - 1  ;
+       DoSetItemClientData( index , NULL ) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;
+       return index ;

 }
 
 void wxChoice::Delete(int n)
 {
 }
 
 void wxChoice::Delete(int n)
 {

-       wxASSERT( n < m_noStrings ) ;
-    ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_noStrings --;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+
+    if ( HasClientObjectData() )
+    {
+        delete GetClientObject(n);
+    }
+
+    ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , n + 1) ;
+    m_strings.Remove( n ) ;
+    m_datas.RemoveAt( n ) ;
+       SetControl32BitMaximum( (ControlHandle) m_macControl , GetCount()) ;

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

-    for ( int i = 0 ; i < m_noStrings ; i++ )
+    FreeData();
+
+    for ( int i = 0 ; i < GetCount() ; i++ )
+    {
+       ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
+    }
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+    SetControl32BitMaximum( (ControlHandle) m_macControl , 0 ) ;
+}
+
+void wxChoice::FreeData()
+{
+    if ( HasClientObjectData() )

     {
     {

-       ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-       }
-    m_noStrings = 0;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+

 int wxChoice::GetSelection() const
 {
 int wxChoice::GetSelection() const
 {

-    return GetControlValue( m_macControl ) -1 ;
+    return GetControl32BitValue( (ControlHandle) m_macControl ) -1 ;

 }
 
 }
 

-void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+void wxChoice::SetSelection(int n)

 {
 {

-    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
-       event.SetInt(GetSelection());
-    event.SetEventObject(this);
-    event.SetString(GetStringSelection());
-    ProcessCommand(event);
+    SetControl32BitValue( (ControlHandle) m_macControl , n + 1 ) ;

 }
 
 }
 

+// ----------------------------------------------------------------------------
+// string list functions
+// ----------------------------------------------------------------------------

 
 

-void wxChoice::SetSelection(int n)
+int wxChoice::GetCount() const

 {
 {

-    SetControlValue( m_macControl , n + 1 ) ;
+    return m_strings.GetCount() ;

 }
 
 int wxChoice::FindString(const wxString& s) const
 {
 }
 
 int wxChoice::FindString(const wxString& s) const
 {

-    for( int i = 0 ; i < m_noStrings ; i++ )
+    for( int i = 0 ; i < GetCount() ; i++ )

     {
     {

-       if ( GetString( i ) == s )
+       if ( GetString( i ).IsSameAs(s, FALSE) )

                return i ; 
     }
                return i ; 
     }

-    return -1;
+    return wxNOT_FOUND ;
+}
+
+void wxChoice::SetString(int n, const wxString& s)
+{
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));
+
+#if 0 // should do this, but no Insert() so far
+    Delete(n);
+    Insert(n + 1, s);
+#endif

 }
 
 }
 

+

 wxString wxChoice::GetString(int n) const
 {
 wxString wxChoice::GetString(int n) const
 {

-       Str255 text ;
-    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , text ) ;
-    p2cstr( text ) ;
-    return wxString( text );
+       return m_strings[n] ;

 }
 
 }
 

-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxChoice::DoSetItemClientData( int n, void* clientData )

 {
 {

-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+    wxCHECK_RET( n >= 0 && (size_t)n < m_datas.GetCount(),
+                 "invalid index in wxChoice::SetClientData" );
+       
+    m_datas[n] = (char*) clientData ;

 }
 
 }
 

-wxString wxChoice::GetStringSelection () const
+void *wxChoice::DoGetItemClientData(int n) const

 {
 {

-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxString("");
+    wxCHECK_MSG( n >= 0 && (size_t)n < m_datas.GetCount(), NULL,
+                 "invalid index in wxChoice::GetClientData" );
+
+    return (void *)m_datas[n];

 }
 
 }
 

-bool wxChoice::SetStringSelection (const wxString& s)
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )

 {
 {

-    int sel = FindString (s);
-    if (sel > -1)
-        {
-            SetSelection (sel);
-            return TRUE;
-        }
-    else
-        return FALSE;
+    DoSetItemClientData(n, clientData);

 }
 
 }
 

+wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+{
+    return (wxClientData *)DoGetItemClientData(n);
+}
+
+void wxChoice::MacHandleControlClick( WXWidget control , wxInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+         event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    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)
 {
     SetSelection (event.GetInt());
     ProcessCommand (event);
 }
 void wxChoice::Command(wxCommandEvent & event)
 {
     SetSelection (event.GetInt());
     ProcessCommand (event);
 }

-
+*/