X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/150e31d2088687cbfbab548f9e98918f8683d9b5..259c43f679ca655362b5a439e11c87fc0666d663:/include/wx/univ/combobox.h?ds=inline diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index b417a4e2f0..4d3a70b503 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -36,10 +36,6 @@ #ifndef _WX_UNIV_COMBOBOX_H_ #define _WX_UNIV_COMBOBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "univcombobox.h" -#endif - class WXDLLEXPORT wxComboControl; class WXDLLEXPORT wxListBox; class WXDLLEXPORT wxPopupComboWindow; @@ -277,7 +273,7 @@ public: virtual void SetInsertionPoint(long pos); virtual void SetInsertionPointEnd(); virtual long GetInsertionPoint() const; - virtual long GetLastPosition() const; + virtual wxTextPos GetLastPosition() const; virtual void Replace(long from, long to, const wxString& value); virtual void Remove(long from, long to); virtual void SetSelection(long from, long to); @@ -301,11 +297,8 @@ public: virtual wxString GetString(int n) const; virtual void SetString(int n, const wxString& s); virtual int FindString(const wxString& s) const; - virtual void Select(int n); + virtual void SetSelection(int n); virtual int GetSelection() const; - void SetSelection(int n) { Select(n); } - - void SetStringSelection(const wxString& WXUNUSED(s)) { } wxCONTROL_ITEMCONTAINER_CLIENTDATAOBJECT_RECAST