Fixed conflicts with Robert's similar fixes; fixed toolbar size calculation

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 1d647ddd273249276ef893ca71eaa872492513b7..e94aa517a827b61ba52324dec3c76594d229af5f 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -532,10 +532,18 @@ void wxListBase::Sort(const wxSortCompareFunction compfunc)
     delete[] objArray;
 }
 
+// ============================================================================
+// compatibility section from now on
+// ============================================================================
+
+#ifdef wxLIST_COMPATIBILITY
+
 // -----------------------------------------------------------------------------
 // wxList (a.k.a. wxObjectList)
 // -----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxList, wxObject)
+
 void wxObjectListNode::DeleteData()
 {
     delete (wxObject *)GetData();
@@ -545,6 +553,8 @@ void wxObjectListNode::DeleteData()
 // wxStringList
 // -----------------------------------------------------------------------------
 
+IMPLEMENT_DYNAMIC_CLASS(wxStringList, wxObject)
+
 // 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;
 }
 
-static int LINKAGEMODE
+extern "C" int LINKAGEMODE
 wx_comparestrings(const void *arg1, const void *arg2)
 {
   wxChar **s1 = (wxChar **) arg1;
@@ -670,3 +680,6 @@ void wxStringList::Sort()
 
     delete [] array;
 }
+
+#endif // wxLIST_COMPATIBILITY
+