mac encodings support

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index 6560200b01960f1041292436ad3c019b2c3ab931..55c16a374918af2ed6e0a183f675767c3f6e3db1 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dataobjbase.h"
 #endif
 
     #pragma implementation "dataobjbase.h"
 #endif
 


@@ -97,14 +97,17 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
 wxDataObjectComposite::wxDataObjectComposite()
 {
     m_preferred = 0;
 wxDataObjectComposite::wxDataObjectComposite()
 {
     m_preferred = 0;

+}

 
 

-    m_dataObjects.DeleteContents(TRUE);
+wxDataObjectComposite::~wxDataObjectComposite()
+{
+    WX_CLEAR_LIST(wxSimpleDataObjectList, m_dataObjects);

 }
 
 wxDataObjectSimple *
 wxDataObjectComposite::GetObject(const wxDataFormat& format) const
 {
 }
 
 wxDataObjectSimple *
 wxDataObjectComposite::GetObject(const wxDataFormat& format) const
 {

-    wxSimpleDataObjectList::Node *node = m_dataObjects.GetFirst();
+    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.GetFirst();

     while ( node )
     {
         wxDataObjectSimple *dataObj = node->GetData();
     while ( node )
     {
         wxDataObjectSimple *dataObj = node->GetData();


@@ -131,7 +134,7 @@ void wxDataObjectComposite::Add(wxDataObjectSimple *dataObject, bool preferred)
 wxDataFormat
 wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {
 wxDataFormat
 wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 {

-    wxSimpleDataObjectList::Node *node = m_dataObjects.Item( m_preferred );
+    wxSimpleDataObjectList::compatibility_iterator node = m_dataObjects.Item( m_preferred );

 
     wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
 
 
     wxCHECK_MSG( node, wxFormatInvalid, wxT("no preferred format") );
 


@@ -141,9 +144,7 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
 }
 
 #if defined(__WXMSW__)
 }
 
 #if defined(__WXMSW__)

-#ifdef __DIGITALMARS__
-extern "C"
-#endif
+

 size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);


@@ -154,9 +155,7 @@ size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
     return dataObj->GetBufferOffset( format );
 }
 
     return dataObj->GetBufferOffset( format );
 }
 

-#ifdef __DIGITALMARS__
-extern "C"
-#endif
+

 const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
                                                       size_t* size,
                                                       const wxDataFormat& format )
 const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
                                                       size_t* size,
                                                       const wxDataFormat& format )


@@ -169,9 +168,7 @@ const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
     return dataObj->GetSizeFromBuffer( buffer, size, format );
 }
 
     return dataObj->GetSizeFromBuffer( buffer, size, format );
 }
 

-#ifdef __DIGITALMARS__
-extern "C"
-#endif
+

 void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
                                               const wxDataFormat& format )
 {
 void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
                                               const wxDataFormat& format )
 {


@@ -195,7 +192,7 @@ void wxDataObjectComposite::GetAllFormats(wxDataFormat *formats,
                                           Direction WXUNUSED(dir)) const
 {
     size_t n = 0;
                                           Direction WXUNUSED(dir)) const
 {
     size_t n = 0;

-    wxSimpleDataObjectList::Node *node;
+    wxSimpleDataObjectList::compatibility_iterator node;

     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
         // TODO if ( !outputOnlyToo ) && this one counts ...
     for ( node = m_dataObjects.GetFirst(); node; node = node->GetNext() )
     {
         // TODO if ( !outputOnlyToo ) && this one counts ...