diff --git a/interface/wx/combobox.h b/interface/wx/combobox.h index 71a9984d49..f692cc578b 100644 --- a/interface/wx/combobox.h +++ b/interface/wx/combobox.h @@ -311,7 +311,6 @@ public: virtual int GetSelection() const; virtual void GetSelection(long *from, long *to) const; virtual void SetSelection(int n); - virtual void SetSelection(long from, long to); virtual int FindString(const wxString& s, bool bCase = false) const; virtual wxString GetString(unsigned int n) const; virtual wxString GetStringSelection() const; diff --git a/interface/wx/popupwin.h b/interface/wx/popupwin.h index 202eae1923..f7e6aec56e 100644 --- a/interface/wx/popupwin.h +++ b/interface/wx/popupwin.h @@ -22,6 +22,11 @@ class wxPopupWindow: public wxNonOwnedWindow { public: + /** + Default constructor + */ + wxPopupWindow(); + /** Constructor */ @@ -67,6 +72,11 @@ public: class wxPopupTransientWindow : public wxPopupWindow { public: + /** + Default constructor. + */ + wxPopupTransientWindow(); + /** Constructor. */ @@ -96,4 +106,12 @@ public: (which consists in dismissing it if the mouse is clicked outside it). */ virtual bool ProcessLeftDown(wxMouseEvent& event); + +protected: + /** + This is called when the popup is disappeared because of anything + else but direct call to Dismiss(). + */ + virtual void OnDismiss(); + }; diff --git a/interface/wx/versioninfo.h b/interface/wx/versioninfo.h index 295baddec7..2311581485 100644 --- a/interface/wx/versioninfo.h +++ b/interface/wx/versioninfo.h @@ -40,9 +40,9 @@ public: default. @param copyright Copyright string, none by default. */ - wxVersionInfo(const wxString& name, - int major, - int minor, + wxVersionInfo(const wxString& name = wxString(), + int major = 0, + int minor = 0, int micro = 0, const wxString& description = wxString(), const wxString& copyright = wxString());