X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d11715669d9293ce417c91dca69430cc9643d572..80c82e01758cd838aa5c922b848454277b11da26:/src/mac/clipbrd.cpp?ds=sidebyside diff --git a/src/mac/clipbrd.cpp b/src/mac/clipbrd.cpp index d9ea2d3867..ff814a588c 100644 --- a/src/mac/clipbrd.cpp +++ b/src/mac/clipbrd.cpp @@ -131,7 +131,7 @@ void *wxGetClipboardData(wxDataFormat dataFormat, long *len) * Generalized clipboard implementation by Matthew Flatt */ -IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxClipboardBase) +IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject) wxClipboard::wxClipboard() { @@ -202,8 +202,6 @@ bool wxClipboard::AddData( wxDataObject *data ) wxCHECK_MSG( data, FALSE, wxT("data is invalid") ); - wxDataFormat format = data->GetPreferredFormat(); - /* we can only store one wxDataObject */ Clear(); @@ -220,9 +218,9 @@ bool wxClipboard::AddData( wxDataObject *data ) array[i].GetId().c_str() ); #if !TARGET_CARBON - OSErr err = noErr ; + OSErr err = noErr ; #else - OSStatus err = noErr ; + OSStatus err = noErr ; #endif switch ( array[i].GetType() ) @@ -336,7 +334,7 @@ bool wxClipboard::GetData( wxDataObject& data ) { 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] );