add extra space for top border when wxDIALOG_UNIT_COMPATIBILITY == 1 too

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

diff --git a/src/common/dobjcmn.cpp b/src/common/dobjcmn.cpp
index d2d6a4e5b72fdcb299d76f06a0b6ab56ae169a89..ac306c2d902c1381e2f75ec45e81767720d4aa61 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,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

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

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


@@ -94,10 +94,20 @@ bool wxDataObjectBase::IsSupported(const wxDataFormat& format,
 // 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();


@@ -124,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") );
 


@@ -139,30 +149,32 @@ size_t wxDataObjectComposite::GetBufferOffset( const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 

-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, 0,

                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetBufferOffset( format );
 }
 
                  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);
 
 const void* wxDataObjectComposite::GetSizeFromBuffer( const void* buffer,
                                                       size_t* size,
                                                       const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 

-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, NULL,

                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->GetSizeFromBuffer( buffer, size, format );
 }
 
                  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);
 
 void* wxDataObjectComposite::SetSizeInBuffer( void* buffer, size_t size,
                                               const wxDataFormat& format )
 {
     wxDataObjectSimple *dataObj = GetObject(format);
 

-    wxCHECK_MSG( dataObj, FALSE,
+    wxCHECK_MSG( dataObj, NULL,

                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetSizeInBuffer( buffer, size, format );
                  wxT("unsupported format in wxDataObjectComposite"));
 
     return dataObj->SetSizeInBuffer( buffer, size, format );


@@ -180,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 ...


@@ -203,7 +215,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);


@@ -215,7 +227,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);


@@ -225,6 +237,96 @@ 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__)
+
+size_t wxTextDataObject::GetDataSize(const wxDataFormat& format) const
+{
+    if (format == wxDF_UNICODETEXT)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE converter ;
+        return converter.WC2MB( NULL , GetText().c_str() , 0 ) + 2; // add space for trailing unichar 0
+    }
+    else  // == wxDF_TEXT
+    {
+        wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
+        return strlen( (const char*) buffer ) + 1;
+    }
+}
+
+bool wxTextDataObject::GetDataHere(const wxDataFormat& format, void *buf) const
+{
+    if (format == wxDF_UNICODETEXT)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE converter ;
+        size_t len = converter.WC2MB( NULL , GetText().c_str() , 0 ) ;
+        wxCharBuffer buffer = converter.cWX2MB( GetText().c_str() );
+        memcpy( (char*) buf, (const char*) buffer , len + 2); // trailing unichar 0
+    }
+    else
+    {
+        wxCharBuffer buffer = wxConvLibc.cWX2MB( GetText().c_str() );
+        strcpy( (char*) buf, (const char*) buffer );
+    }
+
+    return true;
+}
+
+bool wxTextDataObject::SetData(const wxDataFormat& format,
+                               size_t WXUNUSED(len), const void *buf)
+{
+    if (format == wxDF_UNICODETEXT)
+    {
+        // host native is UTF16
+        wxMBConvUTF16BE converter ;
+        SetText( converter.cMB2WX( (const char*) buf ) );
+    }
+    else
+        SetText( wxConvLibc.cMB2WX( (const char*) buf ) );
+
+    return true;
+}
+
+#else
+

 size_t wxTextDataObject::GetDataSize() const
 {
     return GetTextLength() * sizeof(wxChar);
 size_t wxTextDataObject::GetDataSize() const
 {
     return GetTextLength() * sizeof(wxChar);


@@ -234,16 +336,18 @@ bool wxTextDataObject::GetDataHere(void *buf) const
 {
     wxStrcpy((wxChar *)buf, GetText().c_str());
 
 {
     wxStrcpy((wxChar *)buf, GetText().c_str());
 

-    return TRUE;
+    return true;

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

-    return TRUE;
+    return true;

 }
 
 }
 

+#endif
+

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


@@ -335,11 +439,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)


@@ -348,11 +452,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;

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