only define globals when wxUSE_BASE to avoid duplicate definitions in wxBase and...

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

diff --git a/include/wx/univ/listbox.h b/include/wx/univ/listbox.h
index 03f87df5c084d947607396c36fe3ff2e106ff7ff..d73708e06b0d67b16b36fb2d574fa1ce3440e503 100644 (file)
--- a/include/wx/univ/listbox.h
+++ b/include/wx/univ/listbox.h
@@ -12,11 +12,13 @@
 #ifndef _WX_UNIV_LISTBOX_H_
 #define _WX_UNIV_LISTBOX_H_
 
 #ifndef _WX_UNIV_LISTBOX_H_
 #define _WX_UNIV_LISTBOX_H_
 

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

 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper
 #endif
 
 #include "wx/scrolwin.h"    // for wxScrollHelper

+#include "wx/dynarray.h"
+#include "wx/arrstr.h"

 
 // ----------------------------------------------------------------------------
 // the actions supported by this control
 
 // ----------------------------------------------------------------------------
 // the actions supported by this control


@@ -50,7 +52,7 @@
 // wxListBox: a list of selectable items
 // ----------------------------------------------------------------------------
 
 // wxListBox: a list of selectable items
 // ----------------------------------------------------------------------------
 

-class wxListBox : public wxListBoxBase, public wxScrollHelper
+class WXDLLEXPORT wxListBox : public wxListBoxBase, public wxScrollHelper

 {
 public:
     // ctors and such
 {
 public:
     // ctors and such


@@ -68,6 +70,14 @@ public:
 
         Create(parent, id, pos, size, n, choices, style, validator, name);
     }
 
         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();
 
 
     virtual ~wxListBox();
 


@@ -79,24 +89,35 @@ 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();
     virtual void Delete(int n);
 
 
     // implement the listbox interface defined by wxListBoxBase
     virtual void Clear();
     virtual void Delete(int n);
 

-    virtual int GetCount() const { return (int)m_strings.GetCount(); }
-    virtual wxString GetString(int n) const { return m_strings[n]; }
+    virtual int GetCount() const
+        { return (int)m_strings->GetCount(); }
+    virtual wxString GetString(int n) const
+        { return m_strings->Item(n); }

     virtual void SetString(int n, const wxString& s);
     virtual int FindString(const wxString& s) const
     virtual void SetString(int n, const wxString& s);
     virtual int FindString(const wxString& s) const

-        { return m_strings.Index(s); }
+        { return m_strings->Index(s); }

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

     virtual int DoAppend(const wxString& item);
     virtual void DoInsertItems(const wxArrayString& items, int pos);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual int DoAppend(const wxString& item);
     virtual void DoInsertItems(const wxArrayString& items, int pos);
     virtual void DoSetItems(const wxArrayString& items, void **clientData);


@@ -129,10 +150,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 Select(bool sel = TRUE, int item = -1);
+    void DoSelect(int item = -1, bool sel = true);

 
     // more readable wrapper
 
     // more readable wrapper

-    void Unselect(int item) { Select(FALSE, item); }
+    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);


@@ -141,10 +162,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


@@ -165,8 +186,8 @@ public:
                                long numArg = 0l,
                                const wxString& strArg = wxEmptyString);
 
                                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
 
 protected:
     // geometry


@@ -182,7 +203,6 @@ protected:
     void Init();
 
     // event handlers
     void Init();
 
     // event handlers

-    void OnIdle(wxIdleEvent& event);

     void OnSize(wxSizeEvent& event);
 
     // common part of Clear() and DoSetItems(): clears everything
     void OnSize(wxSizeEvent& event);
 
     // common part of Clear() and DoSetItems(): clears everything


@@ -222,7 +242,7 @@ protected:
 
     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)
 
     // the array containing all items (it is sorted if the listbox has
     // wxLB_SORT style)

-    wxArrayString m_strings;
+    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


@@ -283,19 +303,19 @@ class WXDLLEXPORT wxStdListboxInputHandler : public wxStdInputHandler
 {
 public:
     // if pressing the mouse button in a multiselection listbox should toggle
 {
 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,
     // 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
 
     // base class methods

-    virtual bool HandleKey(wxControl *control,
+    virtual bool HandleKey(wxInputConsumer *consumer,

                            const wxKeyEvent& event,
                            bool pressed);
                            const wxKeyEvent& event,
                            bool pressed);

-    virtual bool HandleMouse(wxControl *control,
+    virtual bool HandleMouse(wxInputConsumer *consumer,

                              const wxMouseEvent& event);
                              const wxMouseEvent& event);

-    virtual bool HandleMouseMove(wxControl *control,
+    virtual bool HandleMouseMove(wxInputConsumer *consumer,

                                  const wxMouseEvent& event);
 
 protected:
                                  const wxMouseEvent& event);
 
 protected:


@@ -305,7 +325,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
 
     // 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);
     int HitTestUnsafe(const wxListBox *listbox, const wxMouseEvent& event);
     int FixItemIndex(const wxListBox *listbox, int item);
     bool IsValidIndex(const wxListBox *listbox, int item);