X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac32ba44a150c9de37a9b56ef7cb10521d0e9347..76e7cfab8fdb0c7862fd07e427af54181717fc62:/src/motif/clipbrd.cpp diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index 1d067954ff..4664139db9 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -1,18 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation -#pragma implementation "clipbrd.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #ifdef __VMS #include "wx/vms_x_fix.h" @@ -23,16 +20,20 @@ #define XtDisplay XTDISPLAY #endif -#include "wx/defs.h" - #if wxUSE_CLIPBOARD -#include "wx/app.h" -#include "wx/bitmap.h" -#include "wx/utils.h" #include "wx/clipbrd.h" -#include "wx/dataobj.h" -#include "wx/ptr_scpd.h" + +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/utils.h" + #include "wx/bitmap.h" + #include "wx/dataobj.h" +#endif + +#include "wx/scopedarray.h" + +typedef wxScopedArray wxDataFormatScopedArray; #ifdef __VMS__ #pragma message disable nosimpint @@ -69,7 +70,7 @@ bool wxClipboardOpen() return wxTheClipboard->IsOpened(); } -bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat) +bool wxIsClipboardFormatAvailable(const wxDataFormat& dataFormat) { return wxTheClipboard->IsSupported( dataFormat ); } @@ -131,7 +132,7 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len) return NULL; // just in case... } -wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat) +wxDataFormat wxEnumClipboardFormats(const wxDataFormat& dataFormat) { // Only wxDF_TEXT supported if (dataFormat == wxDF_TEXT) @@ -146,10 +147,10 @@ wxDataFormat wxRegisterClipboardFormat(char *WXUNUSED(formatName)) return wxDF_INVALID; } -bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *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; } @@ -170,16 +171,19 @@ struct wxDataIdToDataObject #include "wx/listimpl.cpp" -WX_DEFINE_LIST(wxDataObjectList); -WX_DEFINE_LIST(wxDataIdToDataObjectList); +WX_DEFINE_LIST(wxDataObjectList) +WX_DEFINE_LIST(wxDataIdToDataObjectList) +extern "C" +{ #if wxCHECK_LESSTIF() static void wxClipboardCallback( Widget widget, int* data_id, int* priv, int* reason ); -#else +#else // Motif static void wxClipboardCallback( Widget widget, long* data_id, long* priv, int* reason ); -#endif +#endif // Less/Motif +} IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject) @@ -190,7 +194,7 @@ wxClipboard::wxClipboard() wxClipboard::~wxClipboard() { - Clear(); + Clear(); } void wxClipboard::Clear() @@ -205,14 +209,16 @@ void wxClipboard::Clear() for( wxDataIdToDataObjectList::compatibility_iterator node2 = m_idToObject.GetFirst(); node2; node2 = node2->GetNext() ) - delete node->GetData(); + { + delete node2->GetData(); + } m_idToObject.Clear(); } bool wxClipboard::Open() { wxCHECK_MSG( !m_open, false, "clipboard already open" ); - + m_open = true; return true; @@ -228,15 +234,12 @@ 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* 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 ); @@ -280,9 +283,9 @@ bool wxClipboard::AddData( wxDataObject *data ) m_data.Append( data ); Display* xdisplay = wxGlobalDisplay(); - Widget xwidget = (Widget)wxTheApp->GetTopLevelWidget(); + Widget xwidget = (Widget)wxTheApp->GetTopLevelRealizedWidget(); Window xwindow = XtWindow( xwidget ); - wxXmString label( wxTheApp->GetAppName() ); + wxXmString label( wxTheApp->GetAppDisplayName() ); Time timestamp = XtLastTimestampProcessed( xdisplay ); long itemId; @@ -307,7 +310,7 @@ bool wxClipboard::AddData( wxDataObject *data ) wxString id = dfarr[i].GetId(); while( ( retval = XmClipboardCopy( xdisplay, xwindow, itemId, - wxConstCast(id.c_str(), char), + id.char_str(), NULL, size, i, &data_id ) ) == XmClipboardLocked ); @@ -323,14 +326,14 @@ bool wxClipboard::AddData( wxDataObject *data ) void wxClipboard::Close() { wxCHECK_RET( m_open, "clipboard not open" ); - + m_open = false; } bool wxClipboard::IsSupported(const wxDataFormat& format) { Display* xdisplay = wxGlobalDisplay(); - Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelWidget() ); + Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelRealizedWidget() ); bool isSupported = false; int retval, count; unsigned long max_name_length; @@ -390,7 +393,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxCHECK_MSG( m_open, false, "clipboard not open" ); Display* xdisplay = wxGlobalDisplay(); - Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelWidget() ); + Window xwindow = XtWindow( (Widget)wxTheApp->GetTopLevelRealizedWidget() ); Time timestamp = XtLastTimestampProcessed( xdisplay ); wxDataFormat chosenFormat; @@ -412,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 ) { @@ -456,7 +459,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxString id = chosenFormat.GetId(); while( ( retval = XmClipboardInquireLength( xdisplay, xwindow, - wxConstCast(id.c_str(), char), + id.char_str(), &length ) ) == XmClipboardLocked ); if( retval != XmClipboardSuccess ) @@ -465,7 +468,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxCharBuffer buf(length); while( ( retval = XmClipboardRetrieve( xdisplay, xwindow, - wxConstCast(id.c_str(), char), + id.char_str(), (XtPointer)buf.data(), length, &dummy1, &dummy2 ) ) == XmClipboardLocked );