X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9b135950383287e57c465f19879238fb7150a2fa..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/motif/clipbrd.cpp?ds=sidebyside diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index d52fca5d5f..4664139db9 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -4,7 +4,6 @@ // 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 ///////////////////////////////////////////////////////////////////////////// @@ -32,7 +31,9 @@ #include "wx/dataobj.h" #endif -#include "wx/ptr_scpd.h" +#include "wx/scopedarray.h" + +typedef wxScopedArray<wxDataFormat> wxDataFormatScopedArray; #ifdef __VMS__ #pragma message disable nosimpint @@ -149,7 +150,7 @@ wxDataFormat wxRegisterClipboardFormat(char *WXUNUSED(formatName)) bool wxGetClipboardFormatName(const wxDataFormat& dataFormat, char *formatName, int maxCount) { - wxStrncpy( formatName, dataFormat.GetId().c_str(), maxCount ); + wxStrlcpy( formatName, dataFormat.GetId().c_str(), maxCount ); return true; } @@ -233,9 +234,6 @@ bool wxClipboard::SetData( wxDataObject *data ) return AddData( data ); } -wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ) -wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray ) - #if wxCHECK_LESSTIF() void wxClipboardCallback( Widget xwidget, int* data_id, int* priv, int* WXUNUSED(reason) ) @@ -287,7 +285,7 @@ bool wxClipboard::AddData( wxDataObject *data ) Display* xdisplay = wxGlobalDisplay(); Widget xwidget = (Widget)wxTheApp->GetTopLevelRealizedWidget(); Window xwindow = XtWindow( xwidget ); - wxXmString label( wxTheApp->GetAppName() ); + wxXmString label( wxTheApp->GetAppDisplayName() ); Time timestamp = XtLastTimestampProcessed( xdisplay ); long itemId; @@ -312,7 +310,7 @@ bool wxClipboard::AddData( wxDataObject *data ) wxString id = dfarr[i].GetId(); while( ( retval = XmClipboardCopy( xdisplay, xwindow, itemId, - wxConstCast(id.mb_str(), char), + id.char_str(), NULL, size, i, &data_id ) ) == XmClipboardLocked ); @@ -461,7 +459,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxString id = chosenFormat.GetId(); while( ( retval = XmClipboardInquireLength( xdisplay, xwindow, - wxConstCast(id.mb_str(), char), + id.char_str(), &length ) ) == XmClipboardLocked ); if( retval != XmClipboardSuccess ) @@ -470,7 +468,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxCharBuffer buf(length); while( ( retval = XmClipboardRetrieve( xdisplay, xwindow, - wxConstCast(id.mb_str(), char), + id.char_str(), (XtPointer)buf.data(), length, &dummy1, &dummy2 ) ) == XmClipboardLocked );