Committing in .

[wxWidgets.git] / src / mac / clipbrd.cpp

diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp
index d9ea2d386718bf3c448b20e8302e14923a269283..76952a442ea69563a1ef6d3b690b604b7e289a17 100644 (file)
--- a/src/mac/clipbrd.cpp
+++ b/src/mac/clipbrd.cpp
@@ -21,6 +21,7 @@
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"
 #include "wx/metafile.h"
 #include "wx/clipbrd.h"
 #include "wx/intl.h"

+#include "wx/log.h"

 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__
 
 #include "wx/mac/private.h"
 #ifndef __DARWIN__


@@ -131,7 +132,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len)
  * Generalized clipboard implementation by Matthew Flatt
  */
 
  * Generalized clipboard implementation by Matthew Flatt
  */
 

-IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase)
+IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)

 
 wxClipboard::wxClipboard()
 {
 
 wxClipboard::wxClipboard()
 {


@@ -202,8 +203,6 @@ bool wxClipboard::AddData( wxDataObject *data )
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 
 
     wxCHECK_MSG( data, FALSE, wxT("data is invalid") );
 

-    wxDataFormat format = data->GetPreferredFormat();
-

     /* we can only store one wxDataObject */
     Clear();
 
     /* we can only store one wxDataObject */
     Clear();
 


@@ -220,9 +219,9 @@ bool wxClipboard::AddData( wxDataObject *data )
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON
                     array[i].GetId().c_str() );
 
 #if !TARGET_CARBON

-          OSErr err = noErr ;
+        OSErr err = noErr ;

 #else
 #else

-          OSStatus err = noErr ;
+        OSStatus err = noErr ;

 #endif
 
        switch ( array[i].GetType() )
 #endif
 
        switch ( array[i].GetType() )


@@ -336,7 +335,7 @@ bool wxClipboard::GetData( wxDataObject& data )
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 
 {
     wxCHECK_MSG( m_open, FALSE, wxT("clipboard not open") );
 

-    int formatcount = data.GetFormatCount() + 1 ;
+    size_t formatcount = data.GetFormatCount() + 1 ;

     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );
     wxDataFormat *array = new wxDataFormat[ formatcount  ];
     array[0] = data.GetPreferredFormat();
     data.GetAllFormats( &array[1] );