use correct scale when drawing

[wxWidgets.git] / src / osx / carbon / clipbrd.cpp

diff --git a/src/osx/carbon/clipbrd.cpp b/src/osx/carbon/clipbrd.cpp
index fd8e9a6d45fb7b148e7ffec593a40001e62cce53..5024215e12c522a288e429be91291b821467bfa6 100644 (file)
--- a/src/osx/carbon/clipbrd.cpp
+++ b/src/osx/carbon/clipbrd.cpp
@@ -63,6 +63,8 @@ void wxClipboard::Clear()
 {
     wxDELETE(m_data);
 
 {
     wxDELETE(m_data);
 

+    wxCHECK_RET( m_pasteboard, "Clipboard creation failed." );
+

     OSStatus err = PasteboardClear( m_pasteboard );
     if (err != noErr)
     {
     OSStatus err = PasteboardClear( m_pasteboard );
     if (err != noErr)
     {


@@ -155,10 +157,10 @@ bool wxClipboard::GetData( wxDataObject& data )
 
     wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
 
 
     wxCHECK_MSG( m_open, false, wxT("clipboard not open") );
 

-    size_t formatcount = data.GetFormatCount() + 1;
+    size_t formatcount = data.GetFormatCount(wxDataObject::Set) + 1;

     wxDataFormat *array = new wxDataFormat[ formatcount ];
     wxDataFormat *array = new wxDataFormat[ formatcount ];

-    array[0] = data.GetPreferredFormat();
-    data.GetAllFormats( &array[1] );
+    array[0] = data.GetPreferredFormat(wxDataObject::Set);
+    data.GetAllFormats( &array[1], wxDataObject::Set );

 
     bool transferred = false;
 
 
     bool transferred = false;