X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..71ebd60b06f0c299b3f6ae3b11a8dcb4b0306493:/include/wx/listbox.h diff --git a/include/wx/listbox.h b/include/wx/listbox.h index 66f39ed4bf..cab8df6d63 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -5,7 +5,7 @@ // Modified by: // Created: 22.10.99 // RCS-ID: $Id$ -// Copyright: (c) wxWindows team +// Copyright: (c) wxWidgets team // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// @@ -16,10 +16,6 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "listboxbase.h" -#endif - #include "wx/defs.h" #if wxUSE_LISTBOX @@ -27,14 +23,14 @@ #include "wx/ctrlsub.h" // base class // forward declarations are enough here -class WXDLLEXPORT wxArrayInt; -class WXDLLEXPORT wxArrayString; +class WXDLLIMPEXP_FWD_BASE wxArrayInt; +class WXDLLIMPEXP_FWD_BASE wxArrayString; // ---------------------------------------------------------------------------- // global data // ---------------------------------------------------------------------------- -WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr; +extern WXDLLEXPORT_DATA(const char) wxListBoxNameStr[]; // ---------------------------------------------------------------------------- // wxListBox interface is defined by the class wxListBoxBase @@ -46,31 +42,23 @@ public: wxListBoxBase() { } virtual ~wxListBoxBase(); - // all generic methods are in wxControlWithItems, except for the following - // ones which are not yet implemented by wxChoice/wxCombobox - void Insert(const wxString& item, int pos) - { DoInsert(item, pos); } - void Insert(const wxString& item, int pos, void *clientData) - { DoInsert(item, pos); SetClientData(pos, clientData); } - void Insert(const wxString& item, int pos, wxClientData *clientData) - { DoInsert(item, pos); SetClientObject(pos, clientData); } - - void InsertItems(int nItems, const wxString *items, int pos); - void InsertItems(const wxArrayString& items, int pos) - { DoInsertItems(items, pos); } - - void Set(int n, const wxString* items, void **clientData = NULL); - void Set(const wxArrayString& items, void **clientData = NULL) - { DoSetItems(items, clientData); } + void InsertItems(unsigned int nItems, const wxString *items, unsigned int pos) + { Insert(nItems, items, pos); } + void InsertItems(const wxArrayString& items, unsigned int pos) + { Insert(items, pos); } // multiple selection logic virtual bool IsSelected(int n) const = 0; - virtual void SetSelection(int n, bool select = TRUE) = 0; - virtual void Select(int n) { SetSelection(n, TRUE); } - void Deselect(int n) { SetSelection(n, FALSE); } + virtual void SetSelection(int n) { DoSetSelection(n, true); } + void SetSelection(int n, bool select) { DoSetSelection(n, select); } + void Deselect(int n) { DoSetSelection(n, false); } void DeselectAll(int itemToLeaveSelected = -1); - virtual bool SetStringSelection(const wxString& s, bool select = TRUE); + virtual bool SetStringSelection(const wxString& s, bool select); + virtual bool SetStringSelection(const wxString& s) + { + return SetStringSelection(s, true); + } // works for single as well as multiple selection listboxes (unlike // GetSelection which only works for listboxes with single selection) @@ -89,39 +77,46 @@ public: // listbox and ensures that it is visible i.e. not scrolled out of view void AppendAndEnsureVisible(const wxString& s); - // return TRUE if the listbox allows multiple selection + // return true if the listbox allows multiple selection bool HasMultipleSelection() const { return (m_windowStyle & wxLB_MULTIPLE) || (m_windowStyle & wxLB_EXTENDED); } - // return TRUE if this listbox is sorted - bool IsSorted() const { return (m_windowStyle & wxLB_SORT) != 0; } + // override wxItemContainer::IsSorted + virtual bool IsSorted() const { return HasFlag( wxLB_SORT ); } // emulate selecting or deselecting the item event.GetInt() (depending on // event.GetExtraLong()) void Command(wxCommandEvent& event); + // returns the item number at a point or wxNOT_FOUND + int HitTest(const wxPoint& point) const { return DoListHitTest(point); } + +#if WXWIN_COMPATIBILITY_2_6 // compatibility - these functions are deprecated, use the new ones // instead - bool Selected(int n) const { return IsSelected(n); } + wxDEPRECATED( bool Selected(int n) const ); +#endif // WXWIN_COMPATIBILITY_2_6 protected: - // NB: due to wxGTK implementation details, DoInsert() is implemented - // using DoInsertItems() and not the other way round - virtual int DoInsert(const wxString& item, int pos) - { InsertItems(1, &item, pos); return pos; } + virtual void DoSetFirstItem(int n) = 0; - // to be implemented in derived classes - virtual void DoInsertItems(const wxArrayString& items, int pos) = 0; - virtual void DoSetItems(const wxArrayString& items, void **clientData) = 0; + virtual void DoSetSelection(int n, bool select) = 0; - virtual void DoSetFirstItem(int n) = 0; + // there is already wxWindow::DoHitTest() so call this one differently + virtual int DoListHitTest(const wxPoint& WXUNUSED(point)) const + { return wxNOT_FOUND; } +private: DECLARE_NO_COPY_CLASS(wxListBoxBase) }; +#if WXWIN_COMPATIBILITY_2_6 + inline bool wxListBoxBase::Selected(int n) const { return IsSelected(n); } +#endif // WXWIN_COMPATIBILITY_2_6 + // ---------------------------------------------------------------------------- // include the platform-specific class declaration // ---------------------------------------------------------------------------- @@ -132,8 +127,10 @@ protected: #include "wx/msw/listbox.h" #elif defined(__WXMOTIF__) #include "wx/motif/listbox.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/listbox.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/listbox.h" #elif defined(__WXMAC__) #include "wx/mac/listbox.h" #elif defined(__WXPM__)