X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8208e181cb576ec6cda37624923f95a59af43072..b668a73527cd08aae1321bfb1c604c9b96fffbed:/src/mac/carbon/choice.cpp

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 343f3d239e..9c4e7d94a9 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -15,135 +15,209 @@
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/choice.h"
+#include "wx/menu.h"
 #include "wx/mac/uma.h"
 
+#if !USE_SHARED_LIBRARY
 IMPLEMENT_DYNAMIC_CLASS(wxChoice, wxControl)
+#endif
+
+short nextMenuId = 100 ; // wxMenu takes the lower ids
+
+wxChoice::~wxChoice()
+{
+	// DeleteMenu( m_macPopUpMenuId ) ;
+	DisposeMenu( m_macPopUpMenuHandle ) ;
+}
 
 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)
 {
-    m_noStrings = n;
 
 		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 , 
 	  	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 ) ;
+	 	SetControlMinimum( m_macControl , 0 ) ;
+		SetControlMaximum( m_macControl , 0) ;
+		if ( n > 0 )
+			SetControlValue( m_macControl , 1 ) ;
 
 		MacPostControlCreate() ;
 
+    for ( int i = 0; i < n; i++ )
+    {
+        Append(choices[i]);
+    }
   	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( m_macPopUpMenuHandle , label ) ;
+	m_strings.Add( item ) ;
+	m_datas.Add( NULL ) ;
+	int index = m_strings.GetCount()  - 1  ;
+	DoSetItemClientData( index , NULL ) ;
+	SetControlMaximum( m_macControl , Number()) ;
+	return index ;
 }
 
 void wxChoice::Delete(int n)
 {
-	wxASSERT( n < m_noStrings ) ;
+    wxCHECK_RET( n < GetCount(), wxT("invalid item index in wxChoice::Delete") );
+
+    if ( HasClientObjectData() )
+    {
+        delete GetClientObject(n);
+    }
+
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_noStrings --;
-	SetControlMaximum( m_macControl , m_noStrings) ;
+    m_strings.Remove( n ) ;
+	  SetControlMaximum( m_macControl , Number()) ;
 }
 
 void wxChoice::Clear()
 {
-    for ( int i = 0 ; i < m_noStrings ; i++ )
+    Free();
+
+    for ( int i = 0 ; i < GetCount() ; i++ )
     {
     	::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
-	}
-    m_noStrings = 0;
-	SetControlMaximum( m_macControl , m_noStrings) ;
+	  }
+    m_strings.Empty() ;
+    m_datas.Empty() ;
+	  SetControlMaximum( m_macControl , 0 ) ;
 }
 
+void wxChoice::Free()
+{
+    if ( HasClientObjectData() )
+    {
+        size_t count = GetCount();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            delete GetClientObject(n);
+        }
+    }
+}
+
+// ----------------------------------------------------------------------------
+// selection
+// ----------------------------------------------------------------------------
+
 int wxChoice::GetSelection() const
 {
     return GetControlValue( 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);
+    SetControlValue( 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
 {
-    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 -1;
+    return wxNOT_FOUND ;
 }
 
-wxString wxChoice::GetString(int n) const
+void wxChoice::SetString(int n, const wxString& s)
 {
-	Str255 text ;
-    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , text ) ;
-    p2cstr( text ) ;
-    return wxString( text );
+    wxFAIL_MSG(wxT("not implemented"));
+
+#if 0 // should do this, but no Insert() so far
+    Delete(n);
+    Insert(n + 1, s);
+#endif
 }
 
-void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)
+
+wxString wxChoice::GetString(int n) const
 {
-  wxControl::SetSize( x,y,width,height,sizeFlags ) ;
+	return m_strings[n] ;
 }
 
-wxString wxChoice::GetStringSelection () const
+// ----------------------------------------------------------------------------
+// client data
+// ----------------------------------------------------------------------------
+
+void wxChoice::DoSetItemClientData( int n, void* clientData )
 {
-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
+    wxCHECK_RET( n >= 0 && 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
-        return wxString("");
+    {
+    	m_datas.Add( (char*) clientData ) ;
+    }
 }
 
-bool wxChoice::SetStringSelection (const wxString& s)
+void *wxChoice::DoGetItemClientData(int N) const
 {
-    int sel = FindString (s);
-    if (sel > -1)
-        {
-            SetSelection (sel);
-            return TRUE;
-        }
-    else
-        return FALSE;
+    wxCHECK_MSG( N >= 0 && N < m_datas.GetCount(), NULL,
+                 "invalid index in wxChoice::GetClientData" );
+
+    return (void *)m_datas[N];
+}
+
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+{
+    DoSetItemClientData(n, clientData);
 }
 
+wxClientData* wxChoice::DoGetItemClientObject( int n ) const
+{
+    return (wxClientData *)DoGetItemClientData(n);
+}
+
+void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart ) 
+{
+    wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
+	  event.SetInt(GetSelection());
+    event.SetEventObject(this);
+    event.SetString(GetStringSelection());
+    ProcessCommand(event);
+}
+/*
 void wxChoice::Command(wxCommandEvent & event)
 {
     SetSelection (event.GetInt());
     ProcessCommand (event);
 }
-
+*/