X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..e5f49cbf82c40fe1c7cc9806be06f6c1aff42659:/include/wx/mac/classic/listbox.h diff --git a/include/wx/mac/classic/listbox.h b/include/wx/mac/classic/listbox.h index 77c0f27209..b6a52434e0 100644 --- a/include/wx/mac/classic/listbox.h +++ b/include/wx/mac/classic/listbox.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: listbox.h +// Name: wx/mac/classic/listbox.h // Purpose: wxListBox class // Author: Stefan Csomor // Modified by: @@ -13,10 +13,6 @@ #ifndef _WX_LISTBOX_H_ #define _WX_LISTBOX_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "listbox.h" -#endif - // ---------------------------------------------------------------------------- // simple types // ---------------------------------------------------------------------------- @@ -85,32 +81,32 @@ public: const wxString& name = wxListBoxNameStr); virtual ~wxListBox(); - virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL); - + virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL); + // implement base class pure virtuals virtual void Clear(); - virtual void Delete(int n); + virtual void Delete(unsigned int n); - virtual int GetCount() const; - virtual wxString GetString(int n) const; - virtual void SetString(int n, const wxString& s); - virtual int FindString(const wxString& s) const; + virtual unsigned int GetCount() const; + virtual wxString GetString(unsigned int n) const; + virtual void SetString(unsigned int n, const wxString& s); + virtual int FindString(const wxString& s, bool bCase = false) const; virtual bool IsSelected(int n) const; - virtual void SetSelection(int n, bool select = TRUE); + virtual void DoSetSelection(int n, bool select); virtual int GetSelection() const; virtual int GetSelections(wxArrayInt& aSelections) const; virtual int DoAppend(const wxString& item); - virtual void DoInsertItems(const wxArrayString& items, int pos); + virtual void DoInsertItems(const wxArrayString& items, unsigned int pos); virtual void DoSetItems(const wxArrayString& items, void **clientData); virtual void DoSetFirstItem(int n); - virtual void DoSetItemClientData(int n, void* clientData); - virtual void* DoGetItemClientData(int n) const; - virtual void DoSetItemClientObject(int n, wxClientData* clientData); - virtual wxClientData* DoGetItemClientObject(int n) const; + virtual void DoSetItemClientData(unsigned int n, void* clientData); + virtual void* DoGetItemClientData(unsigned int n) const; + virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData); + virtual wxClientData* DoGetItemClientObject(unsigned int n) const; virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ; // wxCheckListBox support @@ -157,10 +153,10 @@ protected: bool HasMultipleSelection() const; // free memory (common part of Clear() and dtor) - // prevent collision with some BSD definitions of macro Free() + // prevent collision with some BSD definitions of macro Free() void FreeData(); - int m_noItems; + unsigned int m_noItems; int m_selected; wxString m_typeIn ; long m_lastTypeIn ;