X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c551d959447b3aea01cc35f45aa4cacff2173ba..cd66f45bfebe5c37ee8ffbd7985d12511e6bb86c:/src/mac/carbon/choice.cpp?ds=sidebyside

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 42c52012b2..6c8444fc8a 100644
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -15,39 +15,52 @@
 
 // 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 , (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] ) ;
 		}
 		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() ;
 
@@ -56,27 +69,37 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
 void wxChoice::Append(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 ) ;
+	SetControlMaximum( m_macControl , Number()) ;
+}
+
+void wxChoice::Append(const wxString &item, void *client_data)
+{
+}
+
+void *wxChoice::GetClientData(int index) const
+{
+   return NULL;
 }
 
 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 ) ;
+	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() ;
+	SetControlMaximum( m_macControl , Number()) ;
 }
 
 int wxChoice::GetSelection() const
@@ -101,7 +124,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 ; 
@@ -111,10 +134,7 @@ 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)