wxUniv compilation fixes after wxComboControl patch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39147 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index b884e8482df2c350215059a129aa38f6ddb59697..bda0e3e9fb4b1a0f4e78c93b5ccc4ff32557f285 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -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


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

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

 {
 }
 
 {
 }
 


@@ -136,25 +134,6 @@ void wxComboListBox::SetStringValue(const wxString& value)
         wxListBox::SetStringSelection(value);
     else
         wxListBox::SetSelection(-1);
         wxListBox::SetStringSelection(value);
     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()


@@ -259,7 +238,7 @@ bool wxComboBox::Create(wxWindow *parent,
         return false;
     }
 
         return false;
     }
 

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

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