only set focus on textctrl item if it exists (exists if combo box is editable)

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

diff --git a/src/mac/carbon/choice.cpp b/src/mac/carbon/choice.cpp
index f8068ff829710a48af157ee3e8446c1ecc5d32bf..072badfdd255fe298b6ea83da45536b4b8caeb36 100644 (file)
--- a/src/mac/carbon/choice.cpp
+++ b/src/mac/carbon/choice.cpp
@@ -98,18 +98,18 @@ void wxChoice::Delete(int n)
 
 void wxChoice::Clear()
 {
 
 void wxChoice::Clear()
 {

-    Free();
+    FreeData();

 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;
 
     for ( int i = 0 ; i < GetCount() ; i++ )
     {
        ::DeleteMenuItem( MAC_WXHMENU(m_macPopUpMenuHandle) , 1 ) ;

-         }
+    }

     m_strings.Empty() ;
     m_datas.Empty() ;
     m_strings.Empty() ;
     m_datas.Empty() ;

-       SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;
+    SetControlMaximum( (ControlHandle) m_macControl , 0 ) ;

 }
 
 }
 

-void wxChoice::Free()
+void wxChoice::FreeData()

 {
     if ( HasClientObjectData() )
     {
 {
     if ( HasClientObjectData() )
     {


@@ -156,7 +156,7 @@ int wxChoice::FindString(const wxString& s) const
 
 void wxChoice::SetString(int n, const wxString& s)
 {
 
 void wxChoice::SetString(int n, const wxString& s)
 {

-    wxFAIL_MSG(wxT("not implemented"));
+    wxFAIL_MSG(wxT("wxChoice::SetString() not yet implemented"));

 
 #if 0 // should do this, but no Insert() so far
     Delete(n);
 
 #if 0 // should do this, but no Insert() so far
     Delete(n);