Store menus titles in menus themselves in wxOSX.

[wxWidgets.git] / src / generic / odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index fb9d6b43afb27be21a24ded8cbe57d60594ad403..7321ec28d8807d4c7401d35c9b338134cccc43f5 100644 (file)
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -228,7 +228,7 @@ void wxVListBoxComboPopup::DismissWithEvent()
         m_stringValue = wxEmptyString;
 
     if ( m_stringValue != m_combo->GetValue() )
         m_stringValue = wxEmptyString;
 
     if ( m_stringValue != m_combo->GetValue() )

-        m_combo->SetValueWithEvent(m_stringValue);
+        m_combo->SetValueByUser(m_stringValue);

 
     m_value = selection;
 
 
     m_value = selection;
 


@@ -371,7 +371,7 @@ bool wxVListBoxComboPopup::HandleKey( int keycode, bool saturate, wxChar keychar
         return true;
 
     if ( value >= 0 )
         return true;
 
     if ( value >= 0 )

-        m_combo->SetValue(m_strings[value]);
+        m_combo->ChangeValue(m_strings[value]);

 
     // The m_combo->SetValue() call above sets m_value to the index of this
     // string. But if there are more identical string, the index is of the
 
     // The m_combo->SetValue() call above sets m_value to the index of this
     // string. But if there are more identical string, the index is of the


@@ -545,7 +545,7 @@ int wxVListBoxComboPopup::Append(const wxString& item)
 
         for ( i=0; i<strings.GetCount(); i++ )
         {
 
         for ( i=0; i<strings.GetCount(); i++ )
         {

-            if ( item.CmpNoCase(strings.Item(i)) < 0 )
+            if ( item.CmpNoCase(strings.Item(i)) <= 0 )

             {
                 pos = (int)i;
                 break;
             {
                 pos = (int)i;
                 break;


@@ -993,15 +993,22 @@ void wxOwnerDrawnComboBox::DoClear()
 
     GetVListBoxComboPopup()->Clear();
 
 
     GetVListBoxComboPopup()->Clear();
 

+    // NB: This really needs to be SetValue() instead of ChangeValue(),
+    //     as wxTextEntry API expects an event to be sent.

     SetValue(wxEmptyString);
 }
 
     SetValue(wxEmptyString);
 }
 

+void wxOwnerDrawnComboBox::Clear()
+{
+    DoClear();
+}
+

 void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") );
 
     if ( GetSelection() == (int) n )
 void wxOwnerDrawnComboBox::DoDeleteOneItem(unsigned int n)
 {
     wxCHECK_RET( IsValid(n), wxT("invalid index in wxOwnerDrawnComboBox::Delete") );
 
     if ( GetSelection() == (int) n )

-        SetValue(wxEmptyString);
+        ChangeValue(wxEmptyString);

 
     GetVListBoxComboPopup()->Delete(n);
 }
 
     GetVListBoxComboPopup()->Delete(n);
 }


@@ -1055,7 +1062,7 @@ void wxOwnerDrawnComboBox::Select(int n)
 
     // Refresh text portion in control
     if ( m_text )
 
     // Refresh text portion in control
     if ( m_text )

-        m_text->SetValue( str );
+        m_text->ChangeValue( str );

     else
         m_valueString = str;
 
     else
         m_valueString = str;
 


@@ -1070,6 +1077,11 @@ int wxOwnerDrawnComboBox::GetSelection() const
     return GetVListBoxComboPopup()->GetSelection();
 }
 
     return GetVListBoxComboPopup()->GetSelection();
 }
 

+void wxOwnerDrawnComboBox::GetSelection(long *from, long *to) const
+{
+    wxComboCtrl::GetSelection(from, to);
+}
+

 int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
                                         unsigned int pos,
                                         void **clientData,
 int wxOwnerDrawnComboBox::DoInsertItems(const wxArrayStringsAdapter& items,
                                         unsigned int pos,
                                         void **clientData,