adding ContentScaleFactor support to dc - defaulting to 1.0

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index dcfb1b3358fcad32a5ea71145fb3ea1968a57bc8..58c38ea33a856e912446ae9a750cd3ebff93bb50 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -33,7 +33,7 @@
     #include "wx/crt.h"
 #endif
 
     #include "wx/crt.h"
 #endif
 

-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS

 
 // =============================================================================
 // implementation
 
 // =============================================================================
 // implementation


@@ -171,22 +171,18 @@ void wxListBase::DoCopy(const wxListBase& list)
     {
         case wxKEY_INTEGER:
             {
     {
         case wxKEY_INTEGER:
             {

-                long key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                 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:
             {
                 }
                 break;
             }
 
         case wxKEY_STRING:
             {

-                const wxChar *key;

                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {
                 for ( wxNodeBase *node = list.GetFirst(); node; node = node->GetNext() )
                 {

-                    key = node->GetKeyString();
-                    Append(key, node->GetData());
+                    Append(node->GetKeyString(), node->GetData());

                 }
                 break;
             }
                 }
                 break;
             }


@@ -201,7 +197,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()
 }
 
 wxListBase::~wxListBase()


@@ -701,9 +697,13 @@ bool wxStringList::Member(const wxChar *s) const
 }
 
 #ifdef __WXWINCE__
 }
 
 #ifdef __WXWINCE__

-extern "C" int __cdecl
+extern "C"
+{
+static int __cdecl

 #else
 #else

-extern "C" int LINKAGEMODE
+extern "C"
+{
+static int LINKAGEMODE

 #endif
 
 wx_comparestrings(const void *arg1, const void *arg2)
 #endif
 
 wx_comparestrings(const void *arg1, const void *arg2)


@@ -714,6 +714,8 @@ wx_comparestrings(const void *arg1, const void *arg2)
   return wxStrcmp (*s1, *s2);
 }
 
   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()
 {
 // Sort a list of strings - deallocates old nodes, allocates new
 void wxStringList::Sort()
 {


@@ -750,16 +752,16 @@ wxNode *wxStringList::Prepend(const wxChar *s)
 
 #endif // wxLIST_COMPATIBILITY
 
 
 #endif // wxLIST_COMPATIBILITY
 

-#else // wxUSE_STL = 1
+#else // wxUSE_STD_CONTAINERS = 1

 
     #include "wx/listimpl.cpp"
     WX_DEFINE_LIST(wxObjectList)
 
 
     #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) )
 {
 }
 
 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