reverted Julian's unintentional breakage of wxChoice

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index fc55b174fac0429c5ab85fbbdc619497e1fbcb4f..e94aa517a827b61ba52324dec3c76594d229af5f 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -171,8 +171,8 @@ void wxListBase::DoCopy(const wxListBase& list)
     m_nodeFirst =
     m_nodeLast = (wxNodeBase *) NULL;
 
     m_nodeFirst =
     m_nodeLast = (wxNodeBase *) NULL;
 

-    switch (m_keyType) {
-
+    switch (m_keyType)
+    {

         case wxKEY_INTEGER:
             {
                 long key;
         case wxKEY_INTEGER:
             {
                 long key;


@@ -532,10 +532,18 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
     delete[] objArray;
 }
 
     delete[] objArray;
 }
 

+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+

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

+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+

 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();
 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();


@@ -545,6 +553,8 @@ void wxObjectListNode::DeleteData()
 // wxStringList
 // -----------------------------------------------------------------------------
 
 // wxStringList
 // -----------------------------------------------------------------------------
 

+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+

 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()
 // instead of WX_DEFINE_LIST(wxStringListBase) we define this function
 // ourselves
 void wxStringListNode::DeleteData()


@@ -640,7 +650,7 @@ bool wxStringList::Member(const wxChar *s) const
     return FALSE;
 }
 
     return FALSE;
 }
 

-static int LINKAGEMODE
+extern "C" int LINKAGEMODE

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


@@ -670,3 +680,6 @@ void wxStringList::Sort()
 
     delete [] array;
 }
 
     delete [] array;
 }

+
+#endif // wxLIST_COMPATIBILITY
+