make sure 10.4 command-key events are routed via the wx-accelerator route as well...

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

diff --git a/src/osx/combobox_osx.cpp b/src/osx/combobox_osx.cpp
index 91bc6fa638b90532c6f713dfd9b295ce19979b28..bf092f3772fdfacb043e0bbe96e6ae5fc4c3e95e 100644 (file)
--- a/src/osx/combobox_osx.cpp
+++ b/src/osx/combobox_osx.cpp
@@ -4,7 +4,7 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01

-// RCS-ID:      $Id: combobox_osx.cpp 58318 2009-01-23 08:36:16Z RR $
+// RCS-ID:      $Id$

 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -21,8 +21,6 @@
 
 // work in progress
 
 
 // work in progress
 

-IMPLEMENT_DYNAMIC_CLASS(wxComboBox, wxControl)
-

 wxComboBox::~wxComboBox()
 {
 }
 wxComboBox::~wxComboBox()
 {
 }


@@ -62,21 +60,20 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
 
     if ( !wxControl::Create( parent, id, pos, size, style, validator, name ) )
         return false;
 
     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);
 
     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
         SetSelection( 0 );
 
     // Needed because it is a wxControlWithItems


@@ -123,19 +120,15 @@ int wxComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
 // ----------------------------------------------------------------------------
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {
 // ----------------------------------------------------------------------------
 void wxComboBox::DoSetItemClientData(unsigned int n, void* clientData)
 {

-    wxCHECK_RET( IsValid(n), wxT("wxChoice::DoSetItemClientData: invalid index") );
-

     m_datas[n] = (char*)clientData ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {
     m_datas[n] = (char*)clientData ;
 }
 
 void * wxComboBox::DoGetItemClientData(unsigned int n) const
 {

-    wxCHECK_MSG( IsValid(n), NULL, wxT("wxChoice::DoGetClientData: invalid index") );
-

     return (void *)m_datas[n];
 }
 
     return (void *)m_datas[n];
 }
 

-unsigned int wxComboBox::GetCount() const 
+unsigned int wxComboBox::GetCount() const

 {
     return GetComboPeer()->GetNumberOfItems();
 }
 {
     return GetComboPeer()->GetNumberOfItems();
 }


@@ -148,14 +141,13 @@ void wxComboBox::DoDeleteOneItem(unsigned int n)
 void wxComboBox::DoClear()
 {
     GetComboPeer()->Clear();
 void wxComboBox::DoClear()
 {
     GetComboPeer()->Clear();

-    SetValue(wxEmptyString);

 }
 
 void wxComboBox::GetSelection(long *from, long *to) const
 {
     wxTextEntry::GetSelection(from, to);
 }
 }
 
 void wxComboBox::GetSelection(long *from, long *to) const
 {
     wxTextEntry::GetSelection(from, to);
 }

-    
+

 int wxComboBox::GetSelection() const
 {
     return GetComboPeer()->GetSelectedItem();
 int wxComboBox::GetSelection() const
 {
     return GetComboPeer()->GetSelectedItem();


@@ -174,19 +166,29 @@ void wxComboBox::SetSelection(long from, long to)
 int wxComboBox::FindString(const wxString& s, bool bCase) const
 {
     if (!bCase)
 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);
 }
 
 wxString wxComboBox::GetString(unsigned int n) const
 {
     return GetComboPeer()->FindString(s);
 }
 
 wxString wxComboBox::GetString(unsigned int n) const
 {

+    wxCHECK_MSG( n < GetCount(), wxString(), "Invalid combobox index" );
+

     return GetComboPeer()->GetStringAtIndex(n);
 }
 
 wxString wxComboBox::GetStringSelection() const
 {
     return GetComboPeer()->GetStringAtIndex(n);
 }
 
 wxString wxComboBox::GetStringSelection() const
 {

-    return GetString(GetSelection());
+    const int sel = GetSelection();
+    return sel == wxNOT_FOUND ? wxString() : GetString(sel);

 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)
 }
 
 void wxComboBox::SetString(unsigned int n, const wxString& s)


@@ -196,12 +198,13 @@ void wxComboBox::SetString(unsigned int n, const wxString& s)
     SetValue(s); // changing the item in the list won't update the display item
 }
 
     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());
 {
     wxCommandEvent event(wxEVT_COMMAND_COMBOBOX_SELECTED, m_windowId );
     event.SetInt(GetSelection());


@@ -211,11 +214,6 @@ bool wxComboBox::OSXHandleClicked( double timestampsec )
     return true;
 }
 
     return true;
 }
 

-wxTextWidgetImpl* wxComboBox::GetTextPeer() const
-{
-    return dynamic_cast<wxTextWidgetImpl*> (m_peer);
-}
-

 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
     return dynamic_cast<wxComboWidgetImpl*> (m_peer);
 wxComboWidgetImpl* wxComboBox::GetComboPeer() const
 {
     return dynamic_cast<wxComboWidgetImpl*> (m_peer);