X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/listbox.h?ds=sidebyside diff --git a/include/wx/listbox.h b/include/wx/listbox.h index ce7fa14079..1c8c397b24 100644 --- a/include/wx/listbox.h +++ b/include/wx/listbox.h @@ -16,7 +16,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "listboxbase.h" #endif @@ -45,9 +45,7 @@ class WXDLLEXPORT wxListBoxBase : public wxControlWithItems public: // all generic methods are in wxControlWithItems, except for the following // ones which are not yet implemented by wxChoice/wxCombobox -#ifdef __WXMAC_X__ - virtual ~wxListBoxBase() {} // Added min for Mac X -#endif + virtual ~wxListBoxBase(); void Insert(const wxString& item, int pos) { DoInsert(item, pos); } @@ -69,6 +67,7 @@ public: virtual void SetSelection(int n, bool select = TRUE) = 0; virtual void Select(int n) { SetSelection(n, TRUE); } void Deselect(int n) { SetSelection(n, FALSE); } + void DeselectAll(int itemToLeaveSelected = -1); virtual bool SetStringSelection(const wxString& s, bool select = TRUE); @@ -76,11 +75,29 @@ public: // GetSelection which only works for listboxes with single selection) virtual int GetSelections(wxArrayInt& aSelections) const = 0; - // Set the specified item at the first visible item or scroll to max + // set the specified item at the first visible item or scroll to max // range. void SetFirstItem(int n) { DoSetFirstItem(n); } void SetFirstItem(const wxString& s); + // ensures that the given item is visible scrolling the listbox if + // necessary + virtual void EnsureVisible(int n); + + // a combination of Append() and EnsureVisible(): appends the item to the + // 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 + 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; } + // emulate selecting or deselecting the item event.GetInt() (depending on // event.GetExtraLong()) void Command(wxCommandEvent& event); @@ -92,8 +109,8 @@ public: protected: // NB: due to wxGTK implementation details, DoInsert() is implemented // using DoInsertItems() and not the other way round - void DoInsert(const wxString& item, int pos) - { InsertItems(1, &item, pos); } + virtual int DoInsert(const wxString& item, int pos) + { InsertItems(1, &item, pos); return pos; } // to be implemented in derived classes virtual void DoInsertItems(const wxArrayString& items, int pos) = 0; @@ -106,20 +123,20 @@ protected: // include the platform-specific class declaration // ---------------------------------------------------------------------------- -#if defined(__WXMSW__) +#if defined(__WXUNIVERSAL__) + #include "wx/univ/listbox.h" +#elif defined(__WXMSW__) #include "wx/msw/listbox.h" #elif defined(__WXMOTIF__) #include "wx/motif/listbox.h" #elif defined(__WXGTK__) #include "wx/gtk/listbox.h" -#elif defined(__WXQT__) - #include "wx/qt/listbox.h" #elif defined(__WXMAC__) #include "wx/mac/listbox.h" #elif defined(__WXPM__) #include "wx/os2/listbox.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/listbox.h" +#elif defined(__WXCOCOA__) + #include "wx/cocoa/listbox.h" #endif #endif // wxUSE_LISTBOX