Changed wxYield calls to wxYieldIfNeeded

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index 42c52012b2f3e7dd017a4096b6b4d02c274e23a2..6c8444fc8af4cd7851530de623ecbd8ab92601ef 100644 (file)
--- 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"
 
 // 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
 
 #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,
 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, 
-               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++ )
                {
        
                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 ) ;
                }
                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() ;
 
 
                MacPostControlCreate() ;
 


@@ -56,27 +69,37 @@ bool wxChoice::Create(wxWindow *parent, wxWindowID id,
 
 void wxChoice::Append(const wxString& item)
 {
 
 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)
 {
 }
 
 void wxChoice::Delete(int n)
 {

-       wxASSERT( n < m_noStrings ) ;

     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;
     ::DeleteMenuItem( m_macPopUpMenuHandle , n + 1) ;

-    m_noStrings --;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    m_strings.Remove( n ) ;
+       SetControlMaximum( m_macControl , Number()) ;

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

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

     {
        ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
        }
     {
        ::DeleteMenuItem( m_macPopUpMenuHandle , 1 ) ;
        }

-    m_noStrings = 0;
-       SetControlMaximum( m_macControl , m_noStrings) ;
+    m_strings.Clear() ;
+       SetControlMaximum( m_macControl , Number()) ;

 }
 
 int wxChoice::GetSelection() const
 }
 
 int wxChoice::GetSelection() const


@@ -101,7 +124,7 @@ void wxChoice::SetSelection(int n)
 
 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 < Number() ; i++ )

     {
        if ( GetString( i ) == s )
                return i ; 
     {
        if ( GetString( i ) == s )
                return i ; 


@@ -111,10 +134,7 @@ int wxChoice::FindString(const wxString& s) const
 
 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)
 }
 
 void wxChoice::SetSize(int x, int y, int width, int height, int sizeFlags)