X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/18dbdd3c2785b504c02ebf3739503a0183cae39b..ce321570b08e1a2937415ef6388a1a98fd1c4b83:/include/wx/univ/listbox.h diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h index 07bbd27a55..e47013efdd 100644 --- a/include/wx/univ/listbox.h +++ b/include/wx/univ/listbox.h @@ -70,6 +70,14 @@ public: Create(parent, id, pos, size, n, choices, style, validator, name); } + wxListBox(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr ); virtual ~wxListBox(); @@ -81,6 +89,14 @@ public: long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxListBoxNameStr); + bool Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + const wxArrayString& choices, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxListBoxNameStr); // implement the listbox interface defined by wxListBoxBase virtual void Clear(); @@ -94,7 +110,7 @@ public: virtual bool IsSelected(int n) const { return m_selections.Index(n) != wxNOT_FOUND; } - virtual void SetSelection(int n, bool select = TRUE); + virtual void SetSelection(int n, bool select = true); virtual int GetSelection() const; virtual int GetSelections(wxArrayInt& aSelections) const; @@ -131,10 +147,10 @@ public: void Activate(int item = -1); // select or unselect the specified or current (if -1) item - void DoSelect(int item = -1, bool sel = TRUE); + void DoSelect(int item = -1, bool sel = true); // more readable wrapper - void DoUnselect(int item) { DoSelect(item, FALSE); } + void DoUnselect(int item) { DoSelect(item, false); } // select an item and send a notification about it void SelectAndNotify(int item); @@ -143,10 +159,10 @@ public: virtual void EnsureVisible(int n); // find the first item [strictly] after the current one which starts with - // the given string and make it the current one, return TRUE if the current + // the given string and make it the current one, return true if the current // item changed - bool FindItem(const wxString& prefix, bool strictlyAfter = FALSE); - bool FindNextItem(const wxString& prefix) { return FindItem(prefix, TRUE); } + bool FindItem(const wxString& prefix, bool strictlyAfter = false); + bool FindNextItem(const wxString& prefix) { return FindItem(prefix, true); } // extend the selection to span the range from the anchor (see below) to // the specified or current item @@ -167,11 +183,9 @@ public: long numArg = 0l, const wxString& strArg = wxEmptyString); - // let wxColourScheme choose the right colours for us - virtual bool IsContainerWindow() const { return TRUE; } - // idle processing virtual void OnInternalIdle(); + protected: // geometry virtual wxSize DoGetBestClientSize() const; @@ -292,11 +306,11 @@ class WXDLLEXPORT wxStdListboxInputHandler : public wxStdInputHandler { public: // if pressing the mouse button in a multiselection listbox should toggle - // the item under mouse immediately, then specify TRUE as the second + // the item under mouse immediately, then specify true as the second // parameter (this is the standard behaviour, under GTK the item is toggled // only when the mouse is released in the multi selection listbox) wxStdListboxInputHandler(wxInputHandler *inphand, - bool toggleOnPressAlways = TRUE); + bool toggleOnPressAlways = true); // base class methods virtual bool HandleKey(wxInputConsumer *consumer, @@ -314,7 +328,7 @@ protected: // parts of HitTest(): first finds the pseudo (because not in range) index // of the item and the second one adjusts it if necessary - that is if the - // third one returns FALSE + // third one returns false int HitTestUnsafe(const wxListBox *listbox, const wxMouseEvent& event); int FixItemIndex(const wxListBox *listbox, int item); bool IsValidIndex(const wxListBox *listbox, int item);