Fix horizontal mouse wheel scrolling in wxGTK.

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 7d069da0fffa311b0caeca22b4b4bc9103cf6d56..6eadb1533a9704fc18fc017fe5e635d06d81f474 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Created:     04/01/98
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 ////////////////////////////////////////////////////////////////////////////////
@@ -30,9 +29,10 @@
 
 #ifndef WX_PRECOMP
     #include "wx/list.h"
+    #include "wx/crt.h"
 #endif
 
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
 
 // =============================================================================
 // implementation
@@ -140,7 +140,7 @@ int wxNodeBase::IndexOf() const
 void wxListBase::Init(wxKeyType keyType)
 {
   m_nodeFirst =
-  m_nodeLast = (wxNodeBase *) NULL;
+  m_nodeLast = NULL;
   m_count = 0;
   m_destroy = false;
   m_keyType = keyType;
@@ -164,28 +164,24 @@ void wxListBase::DoCopy(const wxListBase& list)
     m_destroy = list.m_destroy;
     m_keyType = list.m_keyType;
     m_nodeFirst =
-    m_nodeLast = (wxNodeBase *) NULL;
+    m_nodeLast = NULL;
 
     switch (m_keyType)
     {
         case wxKEY_INTEGER:
             {
-                long key;
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
-                    key = node->GetKeyInteger();
-                    Append(key, node->GetData());
+                    Append(node->GetKeyInteger(), node->GetData());
                 }
                 break;
             }
 
         case wxKEY_STRING:
             {
-                const wxChar *key;
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
-                    key = node->GetKeyString();
-                    Append(key, node->GetData());
+                    Append(node->GetKeyString(), node->GetData());
                 }
                 break;
             }
@@ -200,7 +196,7 @@ void wxListBase::DoCopy(const wxListBase& list)
             }
     }
 
-    wxASSERT_MSG( m_count == list.m_count, _T("logic error in wxList::DoCopy") );
+    wxASSERT_MSG( m_count == list.m_count, wxT("logic error in wxList::DoCopy") );
 }
 
 wxListBase::~wxListBase()
@@ -235,12 +231,12 @@ wxNodeBase *wxListBase::AppendCommon(wxNodeBase *node)
 wxNodeBase *wxListBase::Append(void *object)
 {
     // all objects in a keyed list should have a key
-    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
                  wxT("need a key for the object to append") );
 
     // we use wxDefaultListKey even though it is the default parameter value
     // because gcc under Mac OS X seems to miscompile this call otherwise
-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object,
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object,
                                   wxDefaultListKey);
 
     return AppendCommon(node);
@@ -250,10 +246,10 @@ wxNodeBase *wxListBase::Append(long key, void *object)
 {
     wxCHECK_MSG( (m_keyType == wxKEY_INTEGER) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
-                 (wxNodeBase *)NULL,
+                 NULL,
                  wxT("can't append object with numeric key to this list") );
 
-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
     return AppendCommon(node);
 }
 
@@ -261,20 +257,20 @@ wxNodeBase *wxListBase::Append (const wxString& key, void *object)
 {
     wxCHECK_MSG( (m_keyType == wxKEY_STRING) ||
                  (m_keyType == wxKEY_NONE && m_count == 0),
-                 (wxNodeBase *)NULL,
+                 NULL,
                  wxT("can't append object with string key to this list") );
 
-    wxNodeBase *node = CreateNode(m_nodeLast, (wxNodeBase *)NULL, object, key);
+    wxNodeBase *node = CreateNode(m_nodeLast, NULL, object, key);
     return AppendCommon(node);
 }
 
 wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
 {
     // all objects in a keyed list should have a key
-    wxCHECK_MSG( m_keyType == wxKEY_NONE, (wxNodeBase *)NULL,
+    wxCHECK_MSG( m_keyType == wxKEY_NONE, NULL,
                  wxT("need a key for the object to insert") );
 
-    wxCHECK_MSG( !position || position->m_list == this, (wxNodeBase *)NULL,
+    wxCHECK_MSG( !position || position->m_list == this, NULL,
                  wxT("can't insert before a node from another list") );
 
     // previous and next node for the node being inserted
@@ -287,7 +283,7 @@ wxNodeBase *wxListBase::Insert(wxNodeBase *position, void *object)
     else
     {
         // inserting in the beginning of the list
-        prev = (wxNodeBase *)NULL;
+        prev = NULL;
         next = m_nodeFirst;
     }
 
@@ -320,7 +316,7 @@ wxNodeBase *wxListBase::Item(size_t n) const
 
     wxFAIL_MSG( wxT("invalid index in wxListBase::Item") );
 
-    return (wxNodeBase *)NULL;
+    return NULL;
 }
 
 wxNodeBase *wxListBase::Find(const wxListKey& key) const
@@ -337,7 +333,7 @@ wxNodeBase *wxListBase::Find(const wxListKey& key) const
     }
 
     // not found
-    return (wxNodeBase *)NULL;
+    return NULL;
 }
 
 wxNodeBase *wxListBase::Find(const void *object) const
@@ -349,7 +345,7 @@ wxNodeBase *wxListBase::Find(const void *object) const
     }
 
     // not found
-    return (wxNodeBase *)NULL;
+    return NULL;
 }
 
 int wxListBase::IndexOf(void *object) const
@@ -436,7 +432,7 @@ void wxListBase::Clear()
     }
 
     m_nodeFirst =
-    m_nodeLast = (wxNodeBase *)NULL;
+    m_nodeLast = NULL;
 
     m_count = 0;
 }
@@ -457,7 +453,7 @@ void *wxListBase::FirstThat(wxListIterateFunction F)
             return current->GetData();
     }
 
-    return (wxNodeBase *)NULL;
+    return NULL;
 }
 
 void *wxListBase::LastThat(wxListIterateFunction F)
@@ -468,7 +464,7 @@ void *wxListBase::LastThat(wxListIterateFunction F)
             return current->GetData();
     }
 
-    return (wxNodeBase *)NULL;
+    return NULL;
 }
 
 // (stefan.hammes@urz.uni-heidelberg.de)
@@ -573,8 +569,6 @@ void wxListBase::DeleteNodes(wxNodeBase* first, wxNodeBase* last)
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
-
 wxList::wxList( int key_type )
     : wxObjectList( (wxKeyType)key_type )
 {
@@ -595,8 +589,6 @@ static inline wxChar* MYcopystring(const wxChar* s)
     return wxStrcpy(copy, s);
 }
 
-IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
-
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()
@@ -704,9 +696,13 @@ bool wxStringList::Member(const wxChar *s) const
 }
 
 #ifdef __WXWINCE__
-extern "C" int __cdecl
+extern "C"
+{
+static int __cdecl
 #else
-extern "C" int LINKAGEMODE
+extern "C"
+{
+static int LINKAGEMODE
 #endif
 
 wx_comparestrings(const void *arg1, const void *arg2)
@@ -717,6 +713,8 @@ wx_comparestrings(const void *arg1, const void *arg2)
   return wxStrcmp (*s1, *s2);
 }
 
+}   // end of extern "C" (required because of GCC Bug c++/33078
+
 // Sort a list of strings - deallocates old nodes, allocates new
 void wxStringList::Sort()
 {
@@ -753,16 +751,16 @@ wxNode *wxStringList::Prepend(const wxChar *s)
 
 #endif // wxLIST_COMPATIBILITY
 
-#else // wxUSE_STL = 1
+#else // wxUSE_STD_CONTAINERS = 1
 
     #include "wx/listimpl.cpp"
     WX_DEFINE_LIST(wxObjectList)
 
-// with wxUSE_STL wxStringList contains wxString objects, not pointers
+// with wxUSE_STD_CONTAINERS wxStringList contains wxString objects, not pointers
 void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )
 {
 }
 
-wxStringListBase::BaseListType wxStringListBase::EmptyList;
+_WX_LIST_HELPER_wxStringListBase::BaseListType _WX_LIST_HELPER_wxStringListBase::EmptyList;
 
-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS