made wxList methods return compatibility_iterator instead of Node * to further reduce...

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index f6e84ec3fa22d278c716626ec7d352229fa44580..90affa06e628789a08b68d498ade0a04af42b00e 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "dataobjbase.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__


@@ -42,7 +38,7 @@
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxSimpleDataObjectList);
+WX_DEFINE_LIST(wxSimpleDataObjectList)

 
 // ----------------------------------------------------------------------------
 // globals
 
 // ----------------------------------------------------------------------------
 // globals


@@ -280,7 +276,8 @@ static wxMBConvUTF16 sUTF16Converter ;
 
 static inline wxMBConv& GetConv(const wxDataFormat& format)
 {
 
 static inline wxMBConv& GetConv(const wxDataFormat& format)
 {

-    return format == wxDF_UNICODETEXT ? sUTF16Converter : (wxMBConv&) wxConvLocal;
+    return format == wxDF_UNICODETEXT ? (wxMBConv&) sUTF16Converter
+                                      : (wxMBConv&) wxConvLocal;

 }
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
 }
 
 size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const