Got rid of some wierd VisualAge debug nonsense that had appeared in this after the...

[wxWidgets.git] / src / mac / combobox.cpp

diff --git a/src/mac/combobox.cpp b/src/mac/combobox.cpp
index d1fd686a8566ec255f14ac730bd162916010a243..a2841c7996e5fd9f331bfbec689d72e9abbbcead 100644 (file)
--- a/src/mac/combobox.cpp
+++ b/src/mac/combobox.cpp
@@ -14,9 +14,12 @@
 #endif
 
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"

+#include "wx/menu.h"

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

+#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
 IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)

+#endif

 
 // right now we don't support editable comboboxes
 
 
 // right now we don't support editable comboboxes
 


@@ -44,7 +47,9 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
                SetControlData( m_macControl , kControlNoPart , kControlPopupButtonMenuHandleTag , sizeof( MenuHandle ) , (char*) &m_macPopUpMenuHandle) ;
                for ( int i = 0 ; i < n ; i++ )
                {
                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 ) ;

                }
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , m_noStrings) ;
                }
                SetControlMinimum( m_macControl , 0 ) ;
                SetControlMaximum( m_macControl , m_noStrings) ;


@@ -125,7 +130,9 @@ void wxComboBox::SetSelection(long from, long to)
 
 void wxComboBox::Append(const wxString& item)
 {
 
 void wxComboBox::Append(const wxString& item)
 {

-       appendmenu( m_macPopUpMenuHandle , item ) ;
+       Str255 label;
+       wxMenuItem::MacBuildMenuString( label , NULL , NULL , item ,false);
+       AppendMenu( m_macPopUpMenuHandle , label ) ;

     m_noStrings ++;
        SetControlMaximum( m_macControl , m_noStrings) ;
 }
     m_noStrings ++;
        SetControlMaximum( m_macControl , m_noStrings) ;
 }


@@ -170,10 +177,16 @@ int wxComboBox::FindString(const wxString& s) const
 
 wxString wxComboBox::GetString(int n) const
 {
 
 wxString wxComboBox::GetString(int n) const
 {

-       Str255 text ;
-    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , text ) ;
-    p2cstr( text ) ;
-    return wxString( text );
+    Str255 p_text ;
+    char   c_text[255];
+    ::GetMenuItemText( m_macPopUpMenuHandle , n+1 , p_text ) ;
+#if TARGET_CARBON
+    p2cstrcpy( c_text, p_text ) ;
+#else
+       p2cstr( p_text ) ;
+    strcpy( c_text, (char *) p_text ) ;
+#endif
+    return wxString( c_text );

 }
 
 wxString wxComboBox::GetStringSelection() const
 }
 
 wxString wxComboBox::GetStringSelection() const