Fix up NSSlider code to not use class posing and instantiate the proper type (now...

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

diff --git a/include/wx/selstore.h b/include/wx/selstore.h
index 8ddb73be184eb7238eab1f7c3fb32d2ba513d00c..b0c0b4e2bad24c5551f9056a0798c8443ac4c5e0 100644 (file)
--- a/include/wx/selstore.h
+++ b/include/wx/selstore.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     08.06.03 (extracted from src/generic/listctrl.cpp)
 // RCS-ID:      $Id$

-// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2000-2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -18,11 +18,14 @@
 // wxSelectedIndices is just a sorted array of indices
 // ----------------------------------------------------------------------------
 
 // wxSelectedIndices is just a sorted array of indices
 // ----------------------------------------------------------------------------
 

-inline int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2) { return n1 - n2; }
+inline int CMPFUNC_CONV wxSizeTCmpFn(size_t n1, size_t n2)
+{
+    return (int)(n1 - n2);
+}

 
 

-WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_LONG(size_t,
-                                         wxSizeTCmpFn,
-                                         wxSelectedIndices);
+WX_DEFINE_SORTED_EXPORTED_ARRAY_CMP_SIZE_T(size_t,
+                                           wxSizeTCmpFn,
+                                           wxSelectedIndices);

 
 // ----------------------------------------------------------------------------
 // wxSelectionStore is used to store the selected items in the virtual
 
 // ----------------------------------------------------------------------------
 // wxSelectionStore is used to store the selected items in the virtual


@@ -45,7 +48,7 @@ public:
     void SetItemCount(size_t count) { m_count = count; }
 
     // special case of SetItemCount(0)
     void SetItemCount(size_t count) { m_count = count; }
 
     // special case of SetItemCount(0)

-    void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = FALSE; }
+    void Clear() { m_itemsSel.Clear(); m_count = 0; m_defaultState = false; }

 
     // must be called when a new item is inserted/added
     void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); }
 
     // must be called when a new item is inserted/added
     void OnItemAdd(size_t WXUNUSED(item)) { wxFAIL_MSG( _T("TODO") ); }


@@ -56,7 +59,7 @@ public:
     // select one item, use SelectRange() insted if possible!
     //
     // returns true if the items selection really changed
     // select one item, use SelectRange() insted if possible!
     //
     // returns true if the items selection really changed

-    bool SelectItem(size_t item, bool select = TRUE);
+    bool SelectItem(size_t item, bool select = true);

 
     // select the range of items
     //
 
     // select the range of items
     //


@@ -65,7 +68,7 @@ public:
     // (meaning that too many items changed state to bother counting them
     // individually)
     bool SelectRange(size_t itemFrom, size_t itemTo,
     // (meaning that too many items changed state to bother counting them
     // individually)
     bool SelectRange(size_t itemFrom, size_t itemTo,

-                     bool select = TRUE,
+                     bool select = true,

                      wxArrayInt *itemsChanged = NULL);
 
     // return true if the given item is selected
                      wxArrayInt *itemsChanged = NULL);
 
     // return true if the given item is selected


@@ -80,12 +83,12 @@ public:
 
 private:
     // (re)init
 
 private:
     // (re)init

-    void Init() { m_defaultState = FALSE; }
+    void Init() { m_defaultState = false; }

 
     // the total number of items we handle
     size_t m_count;
 
 
     // the total number of items we handle
     size_t m_count;
 

-    // the default state: normally, FALSE (i.e. off) but maybe set to TRUE if
+    // the default state: normally, false (i.e. off) but maybe set to true if

     // there are more selected items than non selected ones - this allows to
     // handle selection of all items efficiently
     bool m_defaultState;
     // there are more selected items than non selected ones - this allows to
     // handle selection of all items efficiently
     bool m_defaultState;