translating background style BG_PAINT into opaqueness for speed-up of OS redraws...

[wxWidgets.git] / src / osx / combobox_osx.cpp

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 91bc6fa638b90532c6f713dfd9b295ce19979b28..214bdbdff4611cb5d23a4247635fc17ca8a1fd0a 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -62,21 +62,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
-        
-    if (style & wxCB_READONLY)
-        wxLogWarning("wxCB_READONLY style not supported by OS X Cocoa. Use wxChoice instead.");
-    
-    if (style & wxCB_SORT)
-        wxLogWarning("wxCB_SORT style not currently supported by OS X Cocoa.");
-        
+
+    wxASSERT_MSG( !(style & wxCB_SORT),
+                  "wxCB_SORT not currently supported by wxOSX/Cocoa");
+
     m_peer = wxWidgetImpl::CreateComboBox( this, parent, id, NULL, pos, size, style, GetExtraStyle() );
 
     MacPostControlCreate( pos, size );
 
     Append(n, choices);
 
-    // Set the first item as being selected
-    if (n > 0)
+    // Set up the initial value, by default the first item is selected.
+    if ( !value.empty() )
+        SetValue(value);
+    else if (n > 0)
         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems
@@ -123,19 +122,19 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
 // ----------------------------------------------------------------------------
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
-    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );
+    wxCHECK_RET( IsValid(n), "invalid index" );
 
     m_datas[n] = (char*)clientData ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {
-    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );
+    wxCHECK_MSG( IsValid(n), NULL, "invalid index" );
 
     return (void *)m_datas[n];
 }
 
-unsigned int wxComboBox::GetCount() const 
+unsigned int wxComboBox::GetCount() const
 {
     return GetComboPeer()->GetNumberOfItems();
 }
@@ -148,14 +147,13 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
 void wxComboBox::DoClear()
 {
     GetComboPeer()->Clear();
-    SetValue(wxEmptyString);
 }
 
 void wxComboBox::GetSelection(long *from, long *to) const
 {
     wxTextEntry::GetSelection(from, to);
 }
-    
+
 int wxComboBox::GetSelection() const
 {
     return GetComboPeer()->GetSelectedItem();
@@ -174,8 +172,15 @@ void wxComboBox::SetSelection(long from, long to)
 int wxComboBox::FindString(const wxString& s, bool bCase) const
 {
     if (!bCase)
-        wxLogWarning("wxComboBox::FindString on Mac doesn't currently support case insensitive search.");
-    
+    {
+        for (unsigned i = 0; i < GetCount(); i++)
+        {
+            if (s.IsSameAs(GetString(i), false))
+                return i;
+        }
+        return wxNOT_FOUND;
+    }
+
     return GetComboPeer()->FindString(s);
 }
 
@@ -196,12 +201,13 @@ void wxComboBox::SetString(unsigned int n, const wxString& s)
     SetValue(s); // changing the item in the list won't update the display item
 }
 
-void wxComboBox::EnableTextChangedEvents(bool enable)
+void wxComboBox::EnableTextChangedEvents(bool WXUNUSED(enable))
 {
-    wxFAIL_MSG("Method Not Implemented.");
+    // nothing to do here, events are never generated when we change the
+    // control value programmatically anyhow by Cocoa
 }
 
-bool wxComboBox::OSXHandleClicked( double timestampsec )
+bool wxComboBox::OSXHandleClicked( double WXUNUSED(timestampsec) )
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());
@@ -211,11 +217,6 @@ bool wxComboBox::OSXHandleClicked( double timestampsec )
     return true;
 }
 
-wxTextWidgetImpl* wxComboBox::GetTextPeer() const
-{
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
-}
-
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
     return dynamic_cast<wxComboWidgetImpl*> (m_peer);