SetTextColour is gone

[wxWidgets.git] / include / wx / univ / listbox.h

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 06df165a0103bd05c093122540a64c83b694198a..2edbdc1003b630fbc96da02208f6c640840b739e 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_LISTBOX_H_
 #define _WX_UNIV_LISTBOX_H_
 
 #ifndef _WX_UNIV_LISTBOX_H_
 #define _WX_UNIV_LISTBOX_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univlistbox.h"
-#endif
-

 #include "wx/scrolwin.h"    // for wxScrollHelper
 #include "wx/dynarray.h"
 #include "wx/arrstr.h"
 #include "wx/scrolwin.h"    // for wxScrollHelper
 #include "wx/dynarray.h"
 #include "wx/arrstr.h"


@@ -56,7 +52,7 @@ class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper
 {
 public:
     // ctors and such
 {
 public:
     // ctors and such

-    wxListBox();
+    wxListBox() : wxScrollHelper(this) { Init(); }

     wxListBox(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,
     wxListBox(wxWindow *parent,
               wxWindowID id,
               const wxPoint& pos = wxDefaultPosition,


@@ -64,6 +60,20 @@ public:
               int n = 0, const wxString choices[] = (const wxString *) NULL,
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,
               int n = 0, const wxString choices[] = (const wxString *) NULL,
               long style = 0,
               const wxValidator& validator = wxDefaultValidator,

+              const wxString& name = wxListBoxNameStr )
+        : wxScrollHelper(this)
+    {
+        Init();
+
+        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();
               const wxString& name = wxListBoxNameStr );
 
     virtual ~wxListBox();


@@ -76,34 +86,45 @@ public:
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
                 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();
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void Clear();

-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);

 
 

-    virtual int GetCount() const { return (int)m_strings->GetCount(); }
-    virtual wxString GetString(int n) const { return (*m_strings)[n]; }
-    virtual void SetString(int n, const wxString& s);
-    virtual int FindString(const wxString& s) const
-        { return IsSorted() ? m_stringsSorted->Index(s) : m_strings->Index(s); }
+    virtual unsigned int GetCount() const
+        { return (unsigned int)m_strings->GetCount(); }
+    virtual wxString GetString(unsigned int n) const
+        { return m_strings->Item(n); }
+    virtual void SetString(unsigned int n, const wxString& s);
+    virtual int FindString(const wxString& s, bool bCase = false) const
+        { return m_strings->Index(s, bCase); }

 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }
 
     virtual bool IsSelected(int n) const
         { return m_selections.Index(n) != wxNOT_FOUND; }

-    virtual void SetSelection(int n, bool select = TRUE);

     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
 protected:
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
 
 protected:

+    virtual void DoSetSelection(int n, bool select);
+    virtual int DoAppendOnly(const wxString& item);

     virtual int DoAppend(const wxString& item);
     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 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;

 
 public:
     // override some more base class methods
 
 public:
     // override some more base class methods


@@ -126,10 +147,10 @@ public:
     void Activate(int item = -1);
 
     // select or unselect the specified or current (if -1) item
     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
 
     // 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);
 
     // select an item and send a notification about it
     void SelectAndNotify(int item);


@@ -138,10 +159,10 @@ public:
     virtual void EnsureVisible(int n);
 
     // find the first item [strictly] after the current one which starts with
     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
     // 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
 
     // extend the selection to span the range from the anchor (see below) to
     // the specified or current item


@@ -162,6 +183,12 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 

+    static wxInputHandler *GetStdInputHandler(wxInputHandler *handlerDef);
+    virtual wxInputHandler *DoGetStdInputHandler(wxInputHandler *handlerDef)
+    {
+        return GetStdInputHandler(handlerDef);
+    }
+

     // idle processing
     virtual void OnInternalIdle();
 
     // idle processing
     virtual void OnInternalIdle();
 


@@ -217,14 +244,8 @@ protected:
     void UpdateItems();
 
     // the array containing all items (it is sorted if the listbox has
     void UpdateItems();
 
     // the array containing all items (it is sorted if the listbox has

-    // wxLB_SORT style). Note the evil trick: the pointers share the
-    // same location, hence we use m_strings when we don't care if the
-    // array is sorted or not, m_stringsSorted when we do
-    union
-    {
-        wxArrayString* m_strings;
-        wxSortedArrayString* m_stringsSorted;
-    };
+    // wxLB_SORT style)
+    wxArrayString* m_strings;

 
     // this array contains the indices of the selected items (for the single
     // selection listboxes only the first element of it is used and contains
 
     // this array contains the indices of the selected items (for the single
     // selection listboxes only the first element of it is used and contains


@@ -276,60 +297,4 @@ private:
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 
     DECLARE_DYNAMIC_CLASS(wxListBox)
 };
 

-// ----------------------------------------------------------------------------
-// wxStdListboxInputHandler: handles mouse and kbd in a single or multi
-// selection listbox
-// ----------------------------------------------------------------------------
-
-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
-    // 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);
-
-    // base class methods
-    virtual bool HandleKey(wxInputConsumer *consumer,
-                           const wxKeyEvent& event,
-                           bool pressed);
-    virtual bool HandleMouse(wxInputConsumer *consumer,
-                             const wxMouseEvent& event);
-    virtual bool HandleMouseMove(wxInputConsumer *consumer,
-                                 const wxMouseEvent& event);
-
-protected:
-    // return the item under mouse, 0 if the mouse is above the listbox or
-    // GetCount() if it is below it
-    int HitTest(const wxListBox *listbox, const wxMouseEvent& event);
-
-    // 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
-    int HitTestUnsafe(const wxListBox *listbox, const wxMouseEvent& event);
-    int FixItemIndex(const wxListBox *listbox, int item);
-    bool IsValidIndex(const wxListBox *listbox, int item);
-
-    // init m_btnCapture and m_actionMouse
-    wxControlAction SetupCapture(wxListBox *lbox,
-                                 const wxMouseEvent& event,
-                                 int item);
-
-    wxRenderer *m_renderer;
-
-    // the button which initiated the mouse capture (currently 0 or 1)
-    int m_btnCapture;
-
-    // the action to perform when the mouse moves while we capture it
-    wxControlAction m_actionMouse;
-
-    // the ctor parameter toggleOnPressAlways (see comments near it)
-    bool m_toggleOnPressAlways;
-
-    // do we track the mouse outside the window when it is captured?
-    bool m_trackMouseOutside;
-};
-

 #endif // _WX_UNIV_LISTBOX_H_
 #endif // _WX_UNIV_LISTBOX_H_