splitted wxApp docs in wxApp+wxAppConsole docs; fix the signature of the documented...

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

diff --git a/src/mac/carbon/combobxc.cpp b/src/mac/carbon/combobxc.cpp
index 6bb1dd4b48123c681d3b7f2a99a97ffb8c9292e8..c494f9fada09cd27183ec68413b8ba48b0eebe9c 100644 (file)
--- a/src/mac/carbon/combobxc.cpp
+++ b/src/mac/carbon/combobxc.cpp
@@ -422,7 +422,7 @@ wxString wxComboBox::GetValue() const
 #if USE_HICOMBOBOX
     CFStringRef myString;
     HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );
 #if USE_HICOMBOBOX
     CFStringRef myString;
     HIComboBoxCopyTextItemAtIndex( m_peer->GetControlRef(), (CFIndex)GetSelection(), &myString );

-    return wxMacCFStringHolder( myString, m_font.GetEncoding() ).AsString();
+    return wxMacCFStringHolder( myString, GetFont().GetEncoding() ).AsString();

 #else
     wxString        result;
 
 #else
     wxString        result;
 


@@ -547,7 +547,7 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
         HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(),
                                         (CFIndex)pos,
                                         wxMacCFStringHolder(items[i],
         HIComboBoxInsertTextItemAtIndex(m_peer->GetControlRef(),
                                         (CFIndex)pos,
                                         wxMacCFStringHolder(items[i],

-                                                            m_font.GetEncoding()));
+                                                            GetFont().GetEncoding()));

         AssignNewItemClientData(pos, clientData, i, type);
     }
 
         AssignNewItemClientData(pos, clientData, i, type);
     }
 


@@ -670,7 +670,7 @@ void wxComboBox::SetString(unsigned int n, const wxString& s)
 {
 #if USE_HICOMBOBOX
     verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,
 {
 #if USE_HICOMBOBOX
     verify_noerr ( HIComboBoxInsertTextItemAtIndex( m_peer->GetControlRef(), (CFIndex) n,

-        wxMacCFStringHolder(s, m_font.GetEncoding()) ) );
+        wxMacCFStringHolder(s, GetFont().GetEncoding()) ) );

     verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );
 #else
     m_choice->SetString( n , s );
     verify_noerr ( HIComboBoxRemoveItemAtIndex( m_peer->GetControlRef(), (CFIndex) n + 1 ) );
 #else
     m_choice->SetString( n , s );