Fix setting the clipping region for a DC when the region is an

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

diff --git a/src/common/list.cpp b/src/common/list.cpp
index 42368c0e512aeee8ec2c52ec8e73e1a69fa373fa..3d8a0ef389f96c8012ba9cab7ae39f1ee5a9eeac 100644 (file)
--- a/src/common/list.cpp
+++ b/src/common/list.cpp
@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////

-// Name:        list.cpp
+// Name:        src/common/list.cpp

 // Purpose:     wxList implementation
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added
 // Purpose:     wxList implementation
 // Author:      Julian Smart
 // Modified by: VZ at 16/11/98: WX_DECLARE_LIST() and typesafe lists added


@@ -29,7 +29,6 @@
 #include <string.h>
 
 #ifndef WX_PRECOMP
 #include <string.h>
 
 #ifndef WX_PRECOMP

-    #include "wx/defs.h"

     #include "wx/list.h"
 #endif
 
     #include "wx/list.h"
 #endif
 


@@ -742,25 +741,26 @@ void wxStringList::Sort()
 
 wxNode *wxStringList::Add(const wxChar *s)
 {
 
 wxNode *wxStringList::Add(const wxChar *s)
 {

-    return (wxNode *)wxStringListBase::Append(MYcopystring(s));
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Append(MYcopystring(s));

 }
 
 wxNode *wxStringList::Prepend(const wxChar *s)
 {
 }
 
 wxNode *wxStringList::Prepend(const wxChar *s)
 {

-    return (wxNode *)wxStringListBase::Insert(MYcopystring(s));
+    return (wxNode *)(wxStringListBase::Node *)
+            wxStringListBase::Insert(MYcopystring(s));

 }
 
 #endif // wxLIST_COMPATIBILITY
 
 #else // wxUSE_STL = 1
 
 }
 
 #endif // wxLIST_COMPATIBILITY
 
 #else // wxUSE_STL = 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_STL wxStringList contains wxString objects, not pointers

-void wxStringListBase::DeleteFunction( const wxString WXUNUSED(X) )
+void _WX_LIST_HELPER_wxStringListBase::DeleteFunction( wxString WXUNUSED(X) )

 {
 }
 
 #endif // !wxUSE_STL
 {
 }
 
 #endif // !wxUSE_STL

-