X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fbfb8bcc3fa17e079d4219655b173f8ed2ccc65a..926ce9e3ac32e1a33cc43420f76876fac8868436:/src/motif/clipbrd.cpp?ds=sidebyside diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index ea980004f2..1353a842a9 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -1,12 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: clipbrd.cpp +// Name: src/motif/clipbrd.cpp // Purpose: Clipboard functionality // Author: Julian Smart // Modified by: Mattia Barbon (added support for generic wxDataObjects) // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx.h". @@ -168,8 +168,8 @@ struct wxDataIdToDataObject #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataObjectList); -WX_DEFINE_LIST(wxDataIdToDataObjectList); +WX_DEFINE_LIST(wxDataObjectList) +WX_DEFINE_LIST(wxDataIdToDataObjectList) extern "C" { @@ -191,7 +191,7 @@ wxClipboard::wxClipboard() wxClipboard::~wxClipboard() { - Clear(); + Clear(); } void wxClipboard::Clear() @@ -215,7 +215,7 @@ void wxClipboard::Clear() bool wxClipboard::Open() { wxCHECK_MSG( !m_open, false, "clipboard already open" ); - + m_open = true; return true; @@ -231,15 +231,15 @@ bool wxClipboard::SetData( wxDataObject *data ) return AddData( data ); } -wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ); -wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ); +wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ) +wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ) #if wxCHECK_LESSTIF() void wxClipboardCallback( Widget xwidget, int* data_id, - int* priv, int* reason ) + int* priv, int* WXUNUSED(reason) ) #else void wxClipboardCallback( Widget xwidget, long* data_id, - long* priv, int* reason ) + long* priv, int* WXUNUSED(reason) ) #endif { Display* xdisplay = XtDisplay( xwidget ); @@ -326,7 +326,7 @@ bool wxClipboard::AddData( wxDataObject *data ) void wxClipboard::Close() { wxCHECK_RET( m_open, "clipboard not open" ); - + m_open = false; } @@ -415,7 +415,7 @@ bool wxClipboard::GetData( wxDataObject& data ) size_t dfcount = data.GetFormatCount( wxDataObject::Set ); wxDataFormatScopedArray dfarr( new wxDataFormat[dfcount] ); data.GetAllFormats( dfarr.get(), wxDataObject::Set ); - + if( XmClipboardInquireCount( xdisplay, xwindow, &count, &max_name_length ) == XmClipboardSuccess ) {