[ 1515213 ] Combo sample improvements.

[wxWidgets.git] / src / univ / combobox.cpp

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 44d250585a9e0410dcc83d71a713ddcff4c1406a..4c011c1a7e1d34af4d75b6cfaa4e097b89d93274 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/univ/combobox.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        src/univ/combobox.cpp

-// Purpose:     wxComboControl and wxComboBox implementation
+// Purpose:     wxComboBox implementation

 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.12.00
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     15.12.00


@@ -54,7 +54,7 @@ class wxComboListBox : public wxListBox, public wxComboPopup
 {
 public:
     // ctor and dtor
 {
 public:
     // ctor and dtor

-    wxComboListBox(wxComboControlBase *combo);
+    wxComboListBox();

     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods
     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods


@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE(wxComboListBox, wxListBox)
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()
 
     EVT_LEFT_UP(wxComboListBox::OnLeftUp)
 END_EVENT_TABLE()
 

-IMPLEMENT_DYNAMIC_CLASS2(wxComboBox, wxControl, wxComboControl)
+IMPLEMENT_DYNAMIC_CLASS2(wxComboBox, wxControl, wxComboCtrl)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -100,9 +100,7 @@ IMPLEMENT_DYNAMIC_CLASS2(wxComboBox, wxControl, wxComboControl)
 // wxComboListBox
 // ----------------------------------------------------------------------------
 
 // wxComboListBox
 // ----------------------------------------------------------------------------
 

-wxComboListBox::wxComboListBox(wxComboControlBase *combo)
-              : wxListBox(),
-                wxComboPopup(combo)
+wxComboListBox::wxComboListBox() : wxListBox(), wxComboPopup()

 {
 }
 
 {
 }
 


@@ -133,28 +131,12 @@ wxString wxComboListBox::GetStringValue() const
 void wxComboListBox::SetStringValue(const wxString& value)
 {
     if ( !value.empty() )
 void wxComboListBox::SetStringValue(const wxString& value)
 {
     if ( !value.empty() )

-        wxListBox::SetStringSelection(value);
+    {
+               if (FindString(value) != wxNOT_FOUND)
+               wxListBox::SetStringSelection(value);
+       }

     else
         wxListBox::SetSelection(-1);
     else
         wxListBox::SetSelection(-1);

-
-    /*
-    // PRE-GLOBAL WXCOMBOCONTROL CODE:
-
-    // FindItem() would just find the current item for an empty string (it
-    // always matches), but we want to show the first one in such case
-    if ( value.empty() )
-    {
-        if ( GetCount() > 0 )
-        {
-            wxListBox::SetSelection(0);
-        }
-        //else: empty listbox - nothing to do
-    }
-    else if ( !FindItem(value) )
-    {
-        // no match att all
-    }
-    */

 }
 
 void wxComboListBox::OnPopup()
 }
 
 void wxComboListBox::OnPopup()


@@ -170,7 +152,7 @@ bool wxComboListBox::PerformAction(const wxControlAction& action,
     {
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix
     {
         // we don't let the listbox handle this as instead of just using the
         // single key presses, as usual, we use the text ctrl value as prefix

-        // and this is done by wxComboControl itself
+        // and this is done by wxComboCtrl itself

         return true;
     }
 
         return true;
     }
 


@@ -253,13 +235,13 @@ bool wxComboBox::Create(wxWindow *parent,
                         const wxValidator& validator,
                         const wxString& name)
 {
                         const wxValidator& validator,
                         const wxString& name)
 {

-    if ( !wxComboControl::Create(parent, id, value, pos, size, style,
+    if ( !wxComboCtrl::Create(parent, id, value, pos, size, style,

                                  validator, name) )
     {
         return false;
     }
 
                                  validator, name) )
     {
         return false;
     }
 

-    wxComboListBox *combolbox = new wxComboListBox(this);
+    wxComboListBox *combolbox = new wxComboListBox();

     SetPopupControl(combolbox);
 
     m_lbox = combolbox;
     SetPopupControl(combolbox);
 
     m_lbox = combolbox;


@@ -278,12 +260,12 @@ wxComboBox::~wxComboBox()
 
 wxString wxComboBox::GetValue() const
 {
 
 wxString wxComboBox::GetValue() const
 {

-    return wxComboControl::GetValue();
+    return wxComboCtrl::GetValue();

 }
 
 void wxComboBox::SetValue(const wxString& value)
 {
 }
 
 void wxComboBox::SetValue(const wxString& value)
 {

-    wxComboControl::SetValue(value);
+    wxComboCtrl::SetValue(value);

 }
 
 void wxComboBox::Copy()
 }
 
 void wxComboBox::Copy()