added wxUmaskChanger class and wxCHANGE_UMASK macro and use them instead of duplicati...

[wxWidgets.git] / src / common / list.cpp

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 62200c7e5efdc1700cbe8bd0f0f78e06467b39b3..ed3c4a69d67259d8a9e72b758e46456599973030 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -17,7 +17,7 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // headers
 // -----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "list.h"
 #endif
 
     #pragma implementation "list.h"
 #endif
 


@@ -147,7 +147,7 @@ void wxListBase::Init(wxKeyType keyType)
   m_nodeFirst =
   m_nodeLast = (wxNodeBase *) NULL;
   m_count = 0;
   m_nodeFirst =
   m_nodeLast = (wxNodeBase *) NULL;
   m_count = 0;

-  m_destroy = FALSE;
+  m_destroy = false;

   m_keyType = keyType;
 }
 
   m_keyType = keyType;
 }
 


@@ -345,7 +345,7 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const
     return (wxNodeBase *)NULL;
 }
 
     return (wxNodeBase *)NULL;
 }
 

-wxNodeBase *wxListBase::Find(void *object) const
+wxNodeBase *wxListBase::Find(const void *object) const

 {
     for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
     {
 {
     for ( wxNodeBase *current = GetFirst(); current; current = current->GetNext() )
     {


@@ -408,11 +408,11 @@ wxNodeBase *wxListBase::DetachNode(wxNodeBase *node)
 bool wxListBase::DeleteNode(wxNodeBase *node)
 {
     if ( !DetachNode(node) )
 bool wxListBase::DeleteNode(wxNodeBase *node)
 {
     if ( !DetachNode(node) )

-        return FALSE;
+        return false;

 
     DoDeleteNode(node);
 
 
     DoDeleteNode(node);
 

-    return TRUE;
+    return true;

 }
 
 bool wxListBase::DeleteObject(void *object)
 }
 
 bool wxListBase::DeleteObject(void *object)


@@ -422,12 +422,12 @@ bool wxListBase::DeleteObject(void *object)
         if ( current->GetData() == object )
         {
             DeleteNode(current);
         if ( current->GetData() == object )
         {
             DeleteNode(current);

-            return TRUE;
+            return true;

         }
     }
 
     // not found
         }
     }
 
     // not found

-    return FALSE;
+    return false;

 }
 
 void wxListBase::Clear()
 }
 
 void wxListBase::Clear()


@@ -519,7 +519,11 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
     }
 
     // sort the array
     }
 
     // sort the array

-    qsort((void *)objArray,num,sizeof(wxObject *),compfunc);
+    qsort((void *)objArray,num,sizeof(wxObject *),
+#ifdef __WXWINCE__
+        (int (__cdecl *)(const void *,const void *))
+#endif
+        compfunc);

 
     // put the sorted pointers back into the list
     objPtr = objArray;
 
     // put the sorted pointers back into the list
     objPtr = objArray;


@@ -570,24 +574,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
 
 #ifdef wxLIST_COMPATIBILITY
 
 
 #ifdef wxLIST_COMPATIBILITY
 

-// -----------------------------------------------------------------------------
-// wxNodeBase deprecated methods
-// -----------------------------------------------------------------------------
-
-wxNode *wxNodeBase::Next() const { return (wxNode *)GetNext(); }
-wxNode *wxNodeBase::Previous() const { return (wxNode *)GetPrevious(); }
-wxObject *wxNodeBase::Data() const { return (wxObject *)GetData(); }
-
-// -----------------------------------------------------------------------------
-// wxListBase deprecated methods
-// -----------------------------------------------------------------------------
-
-int wxListBase::Number() const { return GetCount(); }
-wxNode *wxListBase::First() const { return (wxNode *)GetFirst(); }
-wxNode *wxListBase::Last() const { return (wxNode *)GetLast(); }
-wxNode *wxListBase::Nth(size_t n) const { return (wxNode *)Item(n); }
-wxListBase::operator wxList&() const { return *(wxList*)this; }
-

 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------


@@ -638,12 +624,12 @@ bool wxStringList::Delete(const wxChar *s)
         if ( wxStrcmp(current->GetData(), s) == 0 )
         {
             DeleteNode(current);
         if ( wxStrcmp(current->GetData(), s) == 0 )
         {
             DeleteNode(current);

-            return TRUE;
+            return true;

         }
     }
 
     // not found
         }
     }
 
     // not found

-    return FALSE;
+    return false;

 }
 
 void wxStringList::DoCopy(const wxStringList& other)
 }
 
 void wxStringList::DoCopy(const wxStringList& other)


@@ -659,14 +645,14 @@ void wxStringList::DoCopy(const wxStringList& other)
 
 wxStringList::wxStringList()
 {
 
 wxStringList::wxStringList()
 {

-    DeleteContents(TRUE);
+    DeleteContents(true);

 }
 
 // Variable argument list, terminated by a zero
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {
 }
 
 // Variable argument list, terminated by a zero
 // Makes new storage for the strings
 wxStringList::wxStringList (const wxChar *first, ...)
 {

-  DeleteContents(TRUE);
+  DeleteContents(true);

   if ( !first )
     return;
 
   if ( !first )
     return;
 


@@ -691,7 +677,7 @@ wxStringList::wxStringList (const wxChar *first, ...)
   va_end(ap);
 }
 
   va_end(ap);
 }
 

-// Only makes new strings if arg is TRUE
+// Only makes new strings if arg is true

 wxChar **wxStringList::ListToArray(bool new_copies) const
 {
     wxChar **string_array = new wxChar *[GetCount()];
 wxChar **wxStringList::ListToArray(bool new_copies) const
 {
     wxChar **string_array = new wxChar *[GetCount()];


@@ -716,13 +702,18 @@ bool wxStringList::Member(const wxChar *s) const
     {
         const wxChar *s1 = node->GetData();
         if (s == s1 || wxStrcmp (s, s1) == 0)
     {
         const wxChar *s1 = node->GetData();
         if (s == s1 || wxStrcmp (s, s1) == 0)

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 }
 

+#ifdef __WXWINCE__
+extern "C" int __cdecl
+#else

 extern "C" int LINKAGEMODE
 extern "C" int LINKAGEMODE

+#endif
+

 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;
 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;


@@ -757,7 +748,7 @@ wxNode *wxStringList::Add(const wxChar *s)
 {
     return (wxNode *)wxStringListBase::Append(MYcopystring(s));
 }
 {
     return (wxNode *)wxStringListBase::Append(MYcopystring(s));
 }

-        
+

 wxNode *wxStringList::Prepend(const wxChar *s)
 {
     return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
 wxNode *wxStringList::Prepend(const wxChar *s)
 {
     return (wxNode *)wxStringListBase::Insert(MYcopystring(s));