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 9d771ab73f103eaf538d273f40cf2f119f659a5c..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;


@@ -328,7 +330,7 @@ void wxComboControl::DoMoveWindow(int x, int y, int width, int height)
     wxSize sizeBtn = m_btn->GetBestSize();
 
     wxCoord wText = width - sizeBtn.x;
     wxSize sizeBtn = m_btn->GetBestSize();
 
     wxCoord wText = width - sizeBtn.x;

-    wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint();
+    wxPoint p = GetParent() ? GetParent()->GetClientAreaOrigin() : wxPoint(0,0);

     m_text->SetSize(x - p.x, y - p.y, wText, height);
     m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height);
 }
     m_text->SetSize(x - p.x, y - p.y, wText, height);
     m_btn->SetSize(x - p.x + wText, y - p.y, sizeBtn.x, height);
 }