X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2ca829e7dc84e32a0949cbd852adf9b59cacd0b..411bdf741573f72ff5560f6b5230036c0c0675a8:/include/wx/univ/combobox.h diff --git a/include/wx/univ/combobox.h b/include/wx/univ/combobox.h index 2bb7faccb6..c92cea953e 100644 --- a/include/wx/univ/combobox.h +++ b/include/wx/univ/combobox.h @@ -36,7 +36,7 @@ #ifndef _WX_UNIV_COMBOBOX_H_ #define _WX_UNIV_COMBOBOX_H_ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "univcombobox.h" #endif @@ -277,7 +277,7 @@ public: virtual int GetSelection() const; void SetSelection(int n) { Select(n); } - void SetStringSelection(const wxString& s) { } + void SetStringSelection(const wxString& WXUNUSED(s)) { } // we have to redefine these functions here to avoid ambiguities in classes // deriving from us which would arise otherwise because we inherit these @@ -330,6 +330,7 @@ public: protected: virtual int DoAppend(const wxString& item); + virtual int DoInsert(const wxString& item, int pos); virtual void DoSetItemClientData(int n, void* clientData); virtual void* DoGetItemClientData(int n) const; virtual void DoSetItemClientObject(int n, wxClientData* clientData);