define wxEventLoopBase::ms_activeLoop in appcmn.cpp instead of doing it in all platfo...

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index bf6ecc3dc90b162cc8de9bd1ccd13a4c2aceb9d6..90affa06e628789a08b68d498ade0a04af42b00e 100644 (file)
--- a/src/common/dobjcmn.cpp
+++ b/src/common/dobjcmn.cpp
@@ -5,8 +5,8 @@
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     19.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows Team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets Team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,16 +17,14 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "dataobjbase.h"
-#endif
-

 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 

+#if wxUSE_DATAOBJ
+

 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/debug.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/debug.h"


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

-WX_DEFINE_LIST(wxSimpleDataObjectList);
+WX_DEFINE_LIST(wxSimpleDataObjectList)

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


@@ -61,14 +59,51 @@ wxDataObjectBase::~wxDataObjectBase()
 {
 }
 
 {
 }
 

+bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
+                                   Direction dir) const
+{
+    size_t nFormatCount = GetFormatCount(dir);
+    if ( nFormatCount == 1 )
+    {
+        return format == GetPreferredFormat(dir);
+    }
+    else
+    {
+        wxDataFormat *formats = new wxDataFormat[nFormatCount];
+        GetAllFormats(formats, dir);
+
+        size_t n;
+        for ( n = 0; n < nFormatCount; n++ )
+        {
+            if ( formats[n] == format )
+                break;
+        }
+
+        delete [] formats;
+
+        // found?
+        return n < nFormatCount;
+    }
+}
+

 // ----------------------------------------------------------------------------
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxDataObjectComposite
 // ----------------------------------------------------------------------------
 

+wxDataObjectComposite::wxDataObjectComposite()
+{
+    m_preferred = 0;
+}
+
+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();


@@ -95,7 +130,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") );
 


@@ -104,6 +139,45 @@ wxDataObjectComposite::GetPreferredFormat(Direction WXUNUSED(dir)) const
     return dataObj->GetFormat();
 }
 
     return dataObj->GetFormat();
 }
 

+#if defined(__WXMSW__)
+
+size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, 0,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetBufferOffset( format );
+}
+
+
+const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
+                                                      size_t* size,
+                                                      const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, NULL,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->GetSizeFromBuffer( buffer, size, format );
+}
+
+
+void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
+                                              const wxDataFormat& format )
+{
+    wxDataObjectSimple *dataObj = GetObject(format);
+
+    wxCHECK_MSG( dataObj, NULL,
+                 wxT("unsupported format in wxDataObjectComposite"));
+
+    return dataObj->SetSizeInBuffer( buffer, size, format );
+}
+
+#endif
+

 size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
 {
     // TODO what about the Get/Set only formats?
 size_t wxDataObjectComposite::GetFormatCount(Direction WXUNUSED(dir)) const
 {
     // TODO what about the Get/Set only formats?


@@ -114,7 +188,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 ...


@@ -137,7 +211,7 @@ bool wxDataObjectComposite::GetDataHere(const wxDataFormat& format,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 

-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, false,

                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetDataHere(buf);
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetDataHere(buf);


@@ -149,7 +223,7 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 

-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, false,

                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetData(len, buf);
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetData(len, buf);


@@ -159,25 +233,109 @@ bool wxDataObjectComposite::SetData(const wxDataFormat& format,
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 
 // wxTextDataObject
 // ----------------------------------------------------------------------------
 

+#if defined(__WXGTK20__) && wxUSE_UNICODE
+
+static inline wxMBConv& GetConv(const wxDataFormat& format)
+{
+    // use UTF8 for wxDF_UNICODETEXT and UCS4 for wxDF_TEXT
+    return format == wxDF_UNICODETEXT ? wxConvUTF8 : wxConvLibc;
+}
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    return buffer ? strlen(buffer) + 1 : 0;
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return false;
+
+    strcpy( (char*) buf, buffer );
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+                               size_t WXUNUSED(len), const void *buf)
+{
+    wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf);
+    if ( !buffer )
+        return false;
+
+    SetText(buffer);
+
+    return true;
+}
+
+#elif wxUSE_UNICODE && defined(__WXMAC__)
+
+static wxMBConvUTF16 sUTF16Converter ;
+
+static inline wxMBConv& GetConv(const wxDataFormat& format)
+{
+    return format == wxDF_UNICODETEXT ? (wxMBConv&) sUTF16Converter
+                                      : (wxMBConv&) wxConvLocal;
+}
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 )  
+        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
+    return len ;
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    wxCharBuffer buffer = GetConv(format).cWX2MB( GetText().c_str() );
+    if ( !buffer )
+        return false;
+
+    size_t len = GetConv(format).WC2MB( NULL , GetText().c_str() , 0 )  
+        + ( format == wxDF_UNICODETEXT ? 2 : 1 ) ;
+
+    memcpy( (char*) buf, (const char*) buffer , len ); // trailing (uni)char 0
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+                               size_t WXUNUSED(len), const void *buf)
+{
+    wxWCharBuffer buffer = GetConv(format).cMB2WX((const char *)buf);
+    if ( !buffer )
+        return false;
+    
+    SetText(buffer);
+    
+    return true;
+}
+
+#else
+

 size_t wxTextDataObject::GetDataSize() const
 {
 size_t wxTextDataObject::GetDataSize() const
 {

-    return GetTextLength();
+    return GetTextLength() * sizeof(wxChar);

 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {
 }
 
 bool wxTextDataObject::GetDataHere(void *buf) const
 {

-    strcpy((char *)buf, GetText().mb_str());
+    wxStrcpy((wxChar *)buf, GetText().c_str());

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {
 }
 
 bool wxTextDataObject::SetData(size_t WXUNUSED(len), const void *buf)
 {

-    SetText(wxString((const char *)buf));
+    SetText(wxString((const wxChar *)buf));

 
 

-    return TRUE;
+    return true;

 }
 
 }
 

+#endif
+

 // ----------------------------------------------------------------------------
 // wxFileDataObjectBase
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxFileDataObjectBase
 // ----------------------------------------------------------------------------


@@ -255,7 +413,7 @@ void *wxCustomDataObject::Alloc(size_t size)
 
 void wxCustomDataObject::Free()
 {
 
 void wxCustomDataObject::Free()
 {

-    delete [] m_data;
+    delete [] (char *)m_data;

     m_size = 0;
     m_data = (void *)NULL;
 }
     m_size = 0;
     m_data = (void *)NULL;
 }


@@ -269,11 +427,11 @@ bool wxCustomDataObject::GetDataHere(void *buf) const
 {
     void *data = GetData();
     if ( !data )
 {
     void *data = GetData();
     if ( !data )

-        return FALSE;
+        return false;

 
     memcpy(buf, data, GetSize());
 
 
     memcpy(buf, data, GetSize());
 

-    return TRUE;
+    return true;

 }
 
 bool wxCustomDataObject::SetData(size_t size, const void *buf)
 }
 
 bool wxCustomDataObject::SetData(size_t size, const void *buf)


@@ -282,11 +440,11 @@ bool wxCustomDataObject::SetData(size_t size, const void *buf)
 
     m_data = Alloc(size);
     if ( !m_data )
 
     m_data = Alloc(size);
     if ( !m_data )

-        return FALSE;
+        return false;

 
     memcpy(m_data, buf, m_size = size);
 
 
     memcpy(m_data, buf, m_size = size);
 

-    return TRUE;
+    return true;

 }
 
 // ============================================================================
 }
 
 // ============================================================================


@@ -337,5 +495,6 @@ wxDragResult wxFileDropTarget::OnData(wxCoord x, wxCoord y, wxDragResult def)
     return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
 }
 
     return OnDropFiles(x, y, dobj->GetFilenames()) ? def : wxDragNone;
 }
 

-#endif
+#endif // wxUSE_DRAG_AND_DROP

 
 

+#endif // wxUSE_DATAOBJ