The mmedia contrib requires sys/soundcard.h on unix, so disable it on unix

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

diff --git a/src/univ/combobox.cpp b/src/univ/combobox.cpp
index 1a544c825e383b56fe776e9808280b04fa2992ad..dbe2c63b75b8ffddd74cca403d0d2ec34fde9755 100644 (file)
--- a/src/univ/combobox.cpp
+++ b/src/univ/combobox.cpp
@@ -122,13 +122,15 @@ public:
     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods
     virtual ~wxComboListBox();
 
     // implement wxComboPopup methods

-    virtual bool SetSelection(const wxString& value);
-    virtual void SetSelection(int n, bool select)
-        { wxListBox::SetSelection( n, select); };
+    virtual bool SetSelection(const wxString& s);

     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxCoord GetBestWidth() const;
 
     virtual wxControl *GetControl() { return this; }
     virtual void OnShow();
     virtual wxCoord GetBestWidth() const;
 

+    // fix virtual function hiding
+    virtual void SetSelection(int n) { DoSetSelection(n, true); }
+    void SetSelection(int n, bool select) { DoSetSelection(n, select); }
+

 protected:
     // we shouldn't return height too big from here
     virtual wxSize DoGetBestClientSize() const;
 protected:
     // we shouldn't return height too big from here
     virtual wxSize DoGetBestClientSize() const;


@@ -832,7 +834,7 @@ int wxComboBox::FindString(const wxString& s) const
     return GetLBox()->FindString(s);
 }
 
     return GetLBox()->FindString(s);
 }
 

-void wxComboBox::Select(int n)
+void wxComboBox::SetSelection(int n)

 {
     wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );
 
 {
     wxCHECK_RET( (n >= 0) && (n < GetCount()), _T("invalid index in wxComboBox::Select") );