update from James Bishop

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

diff --git a/include/wx/listbox.h b/include/wx/listbox.h
index 8293a10791b71fa725bff5a932ca59fed0eb9e5a..7c46b0cca5e9388f3ad223390eb726e11e56af0d 100644 (file)
--- a/include/wx/listbox.h
+++ b/include/wx/listbox.h
@@ -6,7 +6,7 @@
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     22.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_BASE_
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_LISTBOX_H_BASE_


@@ -27,14 +27,14 @@
 #include "wx/ctrlsub.h"         // base class
 
 // forward declarations are enough here
 #include "wx/ctrlsub.h"         // base class
 
 // forward declarations are enough here

-class WXDLLEXPORT wxArrayInt;
-class WXDLLEXPORT wxArrayString;
+class WXDLLIMPEXP_BASE wxArrayInt;
+class WXDLLIMPEXP_BASE wxArrayString;

 
 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // global data
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(extern const wxChar*) wxListBoxNameStr;
+extern WXDLLEXPORT_DATA(const wxChar*) wxListBoxNameStr;

 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase
 
 // ----------------------------------------------------------------------------
 // wxListBox interface is defined by the class wxListBoxBase


@@ -65,12 +65,16 @@ public:
 
     // multiple selection logic
     virtual bool IsSelected(int n) const = 0;
 
     // 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);
 
     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)
 
     // works for single as well as multiple selection listboxes (unlike
     // GetSelection which only works for listboxes with single selection)


@@ -89,14 +93,14 @@ public:
     // listbox and ensures that it is visible i.e. not scrolled out of view
     void AppendAndEnsureVisible(const wxString& s);
 
     // 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);
     }
 
     bool HasMultipleSelection() const
     {
         return (m_windowStyle & wxLB_MULTIPLE) ||
                (m_windowStyle & wxLB_EXTENDED);
     }
 

-    // return TRUE if this listbox is sorted
+    // 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
     bool IsSorted() const { return (m_windowStyle & wxLB_SORT) != 0; }
 
     // emulate selecting or deselecting the item event.GetInt() (depending on


@@ -119,6 +123,9 @@ protected:
 
     virtual void DoSetFirstItem(int n) = 0;
 
 
     virtual void DoSetFirstItem(int n) = 0;
 

+    virtual void DoSetSelection(int n, bool select) = 0;
+
+

     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };
 
     DECLARE_NO_COPY_CLASS(wxListBoxBase)
 };