X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/519cb848a8f4c91c73421bb75314754284e593a4..947ea04d016852aa293291069d5c91ce4c6dde60:/src/mac/carbon/choice.cpp?ds=inline

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index da3c4efc92..bac3579f34 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -15,68 +15,123 @@
 
 // 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 ) ;
+}
+
+int wxChoice::GetCount() const {
+	return m_strings.Count() ;
+}
+
+void wxChoice::SetString( int n , const wxString& s ) {
+	m_strings[n] = s ;
+}
+
 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 , (long) this ) ; 
+
+		m_macPopUpMenuHandle =  NewMenu( 1 , "\pPopUp Menu" ) ;
+		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] ) ;
+ 			Str255 label;
+			wxMenuItem::MacBuildMenuString( label , NULL , NULL , choices[i] ,false);
+			AppendMenu( m_macPopUpMenuHandle , label ) ;
+			m_strings.Add( choices[i] ) ;
+			m_dataArray.Add( NULL );
 		}
 		SetControlMinimum( m_macControl , 0 ) ;
-		SetControlMaximum( m_macControl , m_noStrings) ;
-		SetControlValue( m_macControl , 1 ) ;
+		SetControlMaximum( m_macControl , Number()) ;
+		if ( n > 0 )
+			SetControlValue( m_macControl , 1 ) ;
 
 		MacPostControlCreate() ;
 
   	return TRUE;
 }
 
-void wxChoice::Append(const wxString& item)
+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_dataArray.Add( NULL );
+	return m_strings.Count() ;
+}
+
+void *wxChoice::DoGetItemClientData(int N) const
+{
+    return (void *)m_dataArray[N];
+}
+
+void wxChoice::DoSetItemClientData( int N, void* Client_data ) 
+{
+	wxASSERT_MSG( m_dataArray.GetCount() >= N , "invalid client_data array" ) ;
+	
+	if ( m_dataArray.GetCount() > N )
+	{
+    	m_dataArray[N] = (char*) Client_data ;
+    }
+    else
+    {
+    	m_dataArray.Add( (char*) Client_data ) ;
+    }
+}
+
+void wxChoice::DoSetItemClientObject( int n, wxClientData* clientData )
+{
+    DoSetItemClientData(n, clientData);
+}
+
+wxClientData* wxChoice::DoGetItemClientObject( int N ) const
+{
+	return (wxClientData *) DoGetItemClientData( N ) ;
 }
 
 void wxChoice::Delete(int n)
 {
-	wxASSERT( n < m_noStrings ) ;
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
-    m_noStrings --;
-	SetControlMaximum( m_macControl , m_noStrings) ;
+    m_strings.Remove( n ) ;
+	m_dataArray.Remove( n ) ;
+	SetControlMaximum( m_macControl , Number()) ;
 }
 
 void wxChoice::Clear()
 {
-    for ( int i = 0 ; i < m_noStrings ; i++ )
+    for ( int i = 0 ; i < Number() ; i++ )
     {
     	::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
 	}
-    m_noStrings = 0;
-	SetControlMaximum( m_macControl , m_noStrings) ;
+    m_strings.Clear() ;
+  	m_dataArray.Empty() ;
+	SetControlMaximum( m_macControl , Number()) ;
 }
 
 int wxChoice::GetSelection() const
@@ -89,9 +144,8 @@ void wxChoice::MacHandleControlClick( ControlHandle control , SInt16 controlpart
     wxCommandEvent event(wxEVT_COMMAND_CHOICE_SELECTED, m_windowId );
 	event.SetInt(GetSelection());
     event.SetEventObject(this);
-    event.SetString(copystring(GetStringSelection()));
+    event.SetString(GetStringSelection());
     ProcessCommand(event);
-    delete[] event.GetString();
 }
 
 
@@ -102,7 +156,7 @@ void wxChoice::SetSelection(int n)
 
 int wxChoice::FindString(const wxString& s) const
 {
-    for( int i = 0 ; i < m_noStrings ; i++ )
+    for( int i = 0 ; i < Number() ; i++ )
     {
     	if ( GetString( i ) == s )
     		return i ; 
@@ -112,41 +166,11 @@ int wxChoice::FindString(const wxString& s) 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)
+void wxChoice::DoSetSize(int x, int y, int width, int height, int sizeFlags)
 {
   wxControl::SetSize( x,y,width,height,sizeFlags ) ;
 }
 
-wxString wxChoice::GetStringSelection () const
-{
-    int sel = GetSelection ();
-    if (sel > -1)
-        return wxString(this->GetString (sel));
-    else
-        return wxString("");
-}
-
-bool wxChoice::SetStringSelection (const wxString& s)
-{
-    int sel = FindString (s);
-    if (sel > -1)
-        {
-            SetSelection (sel);
-            return TRUE;
-        }
-    else
-        return FALSE;
-}
-
-void wxChoice::Command(wxCommandEvent & event)
-{
-    SetSelection (event.GetInt());
-    ProcessCommand (event);
-}
-