minor changes a bit everywhere + a small wxLog change (Enable()/IsEnabled()

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 94dc5e1798c36a2fa0e7d4a425af8f06920a7046..717414886640e4af6fa5a5edc97623bfd515f036 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -64,7 +64,7 @@ typedef int (CMPFUNC_CONV *CMPFUNC)(const void* pItem1, const void* pItem2);
   @memo Base class for template array and list classes
 */
 // ----------------------------------------------------------------------------
   @memo Base class for template array and list classes
 */
 // ----------------------------------------------------------------------------

-class wxBaseArray
+class WXDLLEXPORT wxBaseArray

 {
 public:
   /** @name ctors and dtor */
 {
 public:
   /** @name ctors and dtor */


@@ -86,20 +86,22 @@ public:
   /** @name memory management */
   //@{
     /// empties the list, but doesn't release memory
   /** @name memory management */
   //@{
     /// empties the list, but doesn't release memory

-  void Empty() { m_uiCount = 0; }
+  void Empty() { m_nCount = 0; }

     /// empties the list and releases memory
   void Clear();
     /// preallocates memory for given number of items
   void Alloc(size_t uiSize);
     /// empties the list and releases memory
   void Clear();
     /// preallocates memory for given number of items
   void Alloc(size_t uiSize);

+    /// minimizes the memory used by the array (frees unused memory)
+  void Shrink();

   //@}
 
   /** @name simple accessors */
   //@{
     /// number of elements in the array
   //@}
 
   /** @name simple accessors */
   //@{
     /// number of elements in the array

-  size_t  Count() const   { return m_uiCount;      }
-  size_t  GetCount() const   { return m_uiCount;      }
+  size_t  Count() const   { return m_nCount;      }
+  size_t  GetCount() const   { return m_nCount;      }

     /// is it empty?
     /// is it empty?

-  bool  IsEmpty() const { return m_uiCount == 0; }
+  bool  IsEmpty() const { return m_nCount == 0; }

   //@}
 
 protected:
   //@}
 
 protected:


@@ -111,7 +113,7 @@ protected:
   //@{
     /// get item at position uiIndex (range checking is done in debug version)
   long& Item(size_t uiIndex) const
   //@{
     /// get item at position uiIndex (range checking is done in debug version)
   long& Item(size_t uiIndex) const

-    { wxASSERT( uiIndex < m_uiCount ); return m_pItems[uiIndex]; }
+    { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; }

     /// same as Item()
   long& operator[](size_t uiIndex) const { return Item(uiIndex); }
   //@}
     /// same as Item()
   long& operator[](size_t uiIndex) const { return Item(uiIndex); }
   //@}


@@ -145,8 +147,8 @@ protected:
 private:
   void    Grow();     // makes array bigger if needed
 
 private:
   void    Grow();     // makes array bigger if needed
 

-  size_t    m_uiSize,   // current size of the array
-          m_uiCount;  // current number of elements
+  size_t  m_nSize,    // current size of the array
+          m_nCount;   // current number of elements

 
   long   *m_pItems;   // pointer to data
 };
 
   long   *m_pItems;   // pointer to data
 };


@@ -163,7 +165,7 @@ private:
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_ARRAY(T, name)                                  \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);       \
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_ARRAY(T, name)                                  \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);       \

-class name : public wxBaseArray                                     \
+class WXDLLEXPORTLOCAL name : public wxBaseArray                                     \

 {                                                                   \
 public:                                                             \
   name()                                                            \
 {                                                                   \
 public:                                                             \
   name()                                                            \


@@ -173,9 +175,9 @@ public:                                                             \
     { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);    \
       return *this; }                                               \
                                                                     \
     { ((wxBaseArray *)this)->operator=((const wxBaseArray&)src);    \
       return *this; }                                               \
                                                                     \

-  T& operator[](size_t uiIndex) const                                 \
+  T& operator[](size_t uiIndex) const                               \

     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \

-  T& Item(size_t uiIndex) const                                       \
+  T& Item(size_t uiIndex) const                                     \

     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
   T& Last() const                                                   \
     { return (T&)(wxBaseArray::Item(Count() - 1)); }                \
     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
   T& Last() const                                                   \
     { return (T&)(wxBaseArray::Item(Count() - 1)); }                \


@@ -185,10 +187,10 @@ public:                                                             \
                                                                     \
   void Add(T Item)                                                  \
     { wxBaseArray::Add((long)Item); }                               \
                                                                     \
   void Add(T Item)                                                  \
     { wxBaseArray::Add((long)Item); }                               \

-  void Insert(T Item, size_t uiIndex)                                 \
+  void Insert(T Item, size_t uiIndex)                               \

     { wxBaseArray::Insert((long)Item, uiIndex) ; }                  \
                                                                     \
     { wxBaseArray::Insert((long)Item, uiIndex) ; }                  \
                                                                     \

-  void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }       \
+  void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }     \

   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
       wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
       wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \


@@ -217,7 +219,7 @@ public:                                                             \
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_SORTED_ARRAY(T, name)                           \
 typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \
 // ----------------------------------------------------------------------------
 #define  _WX_DEFINE_SORTED_ARRAY(T, name)                           \
 typedef int (CMPFUNC_CONV *SCMPFUNC##T)(T pItem1, T pItem2);        \

-class name : public wxBaseArray                                     \
+class WXDLLEXPORTLOCAL  name : public wxBaseArray                                     \

 {                                                                   \
 public:                                                             \
   name(SCMPFUNC##T fn)                                              \
 {                                                                   \
 public:                                                             \
   name(SCMPFUNC##T fn)                                              \


@@ -228,9 +230,9 @@ public:                                                             \
       m_fnCompare = src.m_fnCompare;                                \
       return *this; }                                               \
                                                                     \
       m_fnCompare = src.m_fnCompare;                                \
       return *this; }                                               \
                                                                     \

-  T& operator[](size_t uiIndex) const                                 \
+  T& operator[](size_t uiIndex) const                               \

     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \

-  T& Item(size_t uiIndex) const                                       \
+  T& Item(size_t uiIndex) const                                     \

     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
   T& Last() const                                                   \
     { return (T&)(wxBaseArray::Item(Count() - 1)); }                \
     { return (T&)(wxBaseArray::Item(uiIndex)); }                    \
   T& Last() const                                                   \
     { return (T&)(wxBaseArray::Item(Count() - 1)); }                \


@@ -241,12 +243,12 @@ public:                                                             \
   void Add(T Item)                                                  \
     { wxBaseArray::Add((long)Item, (CMPFUNC)m_fnCompare); }         \
                                                                     \
   void Add(T Item)                                                  \
     { wxBaseArray::Add((long)Item, (CMPFUNC)m_fnCompare); }         \
                                                                     \

-  void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }       \
+  void Remove(size_t uiIndex) { wxBaseArray::Remove(uiIndex); }     \

   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
       wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
         "removing inexisting element in wxArray::Remove" );         \
   void Remove(T Item)                                               \
     { int iIndex = Index(Item);                                     \
       wxCHECK2_MSG( iIndex != NOT_FOUND, return,                    \
         "removing inexisting element in wxArray::Remove" );         \

-      wxBaseArray::Remove((size_t)iIndex); }                          \
+      wxBaseArray::Remove((size_t)iIndex); }                        \

                                                                     \
 private:                                                            \
   SCMPFUNC##T m_fnCompare;                                          \
                                                                     \
 private:                                                            \
   SCMPFUNC##T m_fnCompare;                                          \


@@ -257,7 +259,7 @@ private:                                                            \
 // ----------------------------------------------------------------------------
 #define _WX_DECLARE_LIST(T, name)                                   \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2);     \
 // ----------------------------------------------------------------------------
 #define _WX_DECLARE_LIST(T, name)                                   \
 typedef int (CMPFUNC_CONV *CMPFUNC##T)(T** pItem1, T** pItem2);     \

-class name : public wxBaseArray                                     \
+class WXDLLEXPORTLOCAL  name : public wxBaseArray                                     \

 {                                                                   \
 public:                                                             \
   name() { }                                                        \
 {                                                                   \
 public:                                                             \
   name() { }                                                        \


@@ -266,9 +268,9 @@ public:                                                             \
                                                                     \
   ~name();                                                          \
                                                                     \
                                                                     \
   ~name();                                                          \
                                                                     \

-  T& operator[](size_t uiIndex) const                                 \
+  T& operator[](size_t uiIndex) const                               \

     { return *(T*)wxBaseArray::Item(uiIndex); }                     \
     { return *(T*)wxBaseArray::Item(uiIndex); }                     \

-  T& Item(size_t uiIndex) const                                       \
+  T& Item(size_t uiIndex) const                                     \

     { return *(T*)wxBaseArray::Item(uiIndex); }                     \
   T& Last() const                                                   \
     { return *(T*)(wxBaseArray::Item(Count() - 1)); }               \
     { return *(T*)wxBaseArray::Item(uiIndex); }                     \
   T& Last() const                                                   \
     { return *(T*)(wxBaseArray::Item(Count() - 1)); }               \


@@ -279,16 +281,16 @@ public:                                                             \
   void Add(const T* pItem)                                          \
     { wxBaseArray::Add((long)pItem); }                              \
                                                                     \
   void Add(const T* pItem)                                          \
     { wxBaseArray::Add((long)pItem); }                              \
                                                                     \

-  void Insert(const T& Item,  size_t uiIndex);                        \
-  void Insert(const T* pItem, size_t uiIndex)                         \
+  void Insert(const T& Item,  size_t uiIndex);                      \
+  void Insert(const T* pItem, size_t uiIndex)                       \

     { wxBaseArray::Insert((long)pItem, uiIndex); }                  \
                                                                     \
   void Empty();                                                     \
                                                                     \
     { wxBaseArray::Insert((long)pItem, uiIndex); }                  \
                                                                     \
   void Empty();                                                     \
                                                                     \

-  T*   Detach(size_t uiIndex)                                         \
+  T*   Detach(size_t uiIndex)                                       \

     { T* p = (T*)wxBaseArray::Item(uiIndex);                        \
       wxBaseArray::Remove(uiIndex); return p; }                     \
     { T* p = (T*)wxBaseArray::Item(uiIndex);                        \
       wxBaseArray::Remove(uiIndex); return p; }                     \

-  void Remove(size_t uiIndex);                                        \
+  void Remove(size_t uiIndex);                                      \

                                                                     \
   void Sort(CMPFUNC##T fCmp) { wxBaseArray::Sort((CMPFUNC)fCmp); }  \
                                                                     \
                                                                     \
   void Sort(CMPFUNC##T fCmp) { wxBaseArray::Sort((CMPFUNC)fCmp); }  \
                                                                     \


@@ -393,6 +395,8 @@ private:                                                            \
 // # overhead if not used?
 // ----------------------------------------------------------------------------
 
 // # overhead if not used?
 // ----------------------------------------------------------------------------
 

+#define WXDLLEXPORTLOCAL WXDLLEXPORT
+

 //@{
   /** @name ArrayInt */
 WX_DEFINE_ARRAY(int,    wxArrayInt);
 //@{
   /** @name ArrayInt */
 WX_DEFINE_ARRAY(int,    wxArrayInt);


@@ -404,5 +408,8 @@ WX_DEFINE_ARRAY(void *, wxArrayPtrVoid);
 
 //@}
 
 
 //@}
 

+#undef  WXDLLEXPORTLOCAL
+#define WXDLLEXPORTLOCAL
+

 #endif // _DYNARRAY_H
 
 #endif // _DYNARRAY_H