select current column when Ctrl-Space is pressed; the current row when Shift-Space...

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

diff --git a/include/wx/arrstr.h b/include/wx/arrstr.h
index a78d09e9dd4bb3d46d63d51a78445098dc5e72bf..ddb11c0a31527e9a1a84ea53c7c4474f2161a518 100644 (file)
--- a/include/wx/arrstr.h
+++ b/include/wx/arrstr.h
@@ -15,8 +15,18 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

-WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortAscending(wxString*, wxString*);
-WXDLLIMPEXP_BASE int wxCMPFUNC_CONV wxStringSortDescending(wxString*, wxString*);
+// these functions are only used in STL build now but we define them in any
+// case for compatibility with the existing code outside of the library which
+// could be using them
+inline int wxCMPFUNC_CONV wxStringSortAscending(wxString* s1, wxString* s2)
+{
+    return s1->Cmp(*s2);
+}
+
+inline int wxCMPFUNC_CONV wxStringSortDescending(wxString* s1, wxString* s2)
+{
+    return wxStringSortAscending(s2, s1);
+}

 
 #if wxUSE_STL
 
 
 #if wxUSE_STL
 


@@ -177,7 +187,7 @@ public:
     // sort array elements in alphabetical order (or reversed alphabetical
     // order if reverseOrder parameter is true)
   void Sort(bool reverseOrder = false);
     // sort array elements in alphabetical order (or reversed alphabetical
     // order if reverseOrder parameter is true)
   void Sort(bool reverseOrder = false);

-    // sort array elements using specified comparaison function
+    // sort array elements using specified comparison function

   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
 
   void Sort(CompareFunction compareFunction);
   void Sort(CompareFunction2 compareFunction);
 


@@ -291,6 +301,25 @@ public:
   void reserve(size_type n) /* base::reserve*/;
   void resize(size_type n, value_type v = value_type());
   size_type size() const { return GetCount(); }
   void reserve(size_type n) /* base::reserve*/;
   void resize(size_type n, value_type v = value_type());
   size_type size() const { return GetCount(); }

+  void swap(wxArrayString& other)
+  {
+      // not sure if we can rely on having std::swap() everywhere so do it
+      // manually
+      const size_t savedSize = m_nSize;
+      const size_t savedCount = m_nCount;
+      wxString * const savedItems = m_pItems;
+      const bool savedAutoSort = m_autoSort;
+
+      m_nSize = other.m_nSize;
+      m_nCount = other.m_nCount;
+      m_pItems = other.m_pItems;
+      m_autoSort = other.m_autoSort;
+
+      other.m_nSize = savedSize;
+      other.m_nCount = savedCount;
+      other.m_pItems = savedItems;
+      other.m_autoSort = savedAutoSort;
+  }

 
 protected:
   void Init(bool autoSort);             // common part of all ctors
 
 protected:
   void Init(bool autoSort);             // common part of all ctors


@@ -299,8 +328,6 @@ protected:
 private:
   void Grow(size_t nIncrement = 0);     // makes array bigger if needed
 
 private:
   void Grow(size_t nIncrement = 0);     // makes array bigger if needed
 

-  void DoSort();                        // common part of all Sort() variants
-

   size_t  m_nSize,    // current size of the array
           m_nCount;   // current number of elements
 
   size_t  m_nSize,    // current size of the array
           m_nCount;   // current number of elements
 


@@ -404,7 +431,7 @@ public:
     // default copy constructor is ok
 
     // iteration interface
     // default copy constructor is ok
 
     // iteration interface

-    unsigned int GetCount() const { return m_size; }
+    size_t GetCount() const { return m_size; }

     bool IsEmpty() const { return GetCount() == 0; }
     const wxString& operator[] (unsigned int i) const
     {
     bool IsEmpty() const { return GetCount() == 0; }
     const wxString& operator[] (unsigned int i) const
     {


@@ -429,7 +456,7 @@ private:
     };
 
     wxStringContainerType m_type;
     };
 
     wxStringContainerType m_type;

-    unsigned int m_size;
+    size_t m_size;

     union
     {
         const wxString *      ptr;
     union
     {
         const wxString *      ptr;