wxOS2/OW warning and build fixes.

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 9532eac9ca400a9fffa433d6f73aa476b6eea8cf..9153599e485b86c04c79d52ecabdd82cb48bfc85 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()


@@ -594,12 +594,6 @@ void wxObjectListNode::DeleteData()
 // wxStringList
 // ----------------------------------------------------------------------------
 
 // wxStringList
 // ----------------------------------------------------------------------------
 

-static inline wxChar* MYcopystring(const wxString& s)
-{
-    wxChar* copy = new wxChar[s.length() + 1];
-    return wxStrcpy(copy, s.c_str());
-}
-

 static inline wxChar* MYcopystring(const wxChar* s)
 {
     wxChar* copy = new wxChar[wxStrlen(s) + 1];
 static inline wxChar* MYcopystring(const wxChar* s)
 {
     wxChar* copy = new wxChar[wxStrlen(s) + 1];


@@ -624,12 +618,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)


@@ -645,14 +639,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;
 


@@ -677,7 +671,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()];


@@ -702,10 +696,10 @@ 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__
 }
 
 #ifdef __WXWINCE__


@@ -748,7 +742,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));


@@ -756,4 +750,15 @@ wxNode *wxStringList::Prepend(const wxChar *s)
 
 #endif // wxLIST_COMPATIBILITY
 
 
 #endif // wxLIST_COMPATIBILITY
 

+#else // wxUSE_STL = 1
+
+    #include <wx/listimpl.cpp>
+    WX_DEFINE_LIST(wxObjectList);
+
+// with wxUSE_STL wxStringList contains wxString objects, not pointers
+void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
+{
+}
+

 #endif // !wxUSE_STL
 #endif // !wxUSE_STL

+