X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..a8780ad5bbd52c859eaeba01c2f739cbb15c1576:/src/motif/clipbrd.cpp diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index 08c3f81d81..d52fca5d5f 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -27,11 +27,11 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/utils.h" + #include "wx/bitmap.h" + #include "wx/dataobj.h" #endif -#include "wx/bitmap.h" -#include "wx/utils.h" -#include "wx/dataobj.h" #include "wx/ptr_scpd.h" #ifdef __VMS__ @@ -312,7 +312,7 @@ bool wxClipboard::AddData( wxDataObject *data ) wxString id = dfarr[i].GetId(); while( ( retval = XmClipboardCopy( xdisplay, xwindow, itemId, - wxConstCast(id.c_str(), char), + wxConstCast(id.mb_str(), char), NULL, size, i, &data_id ) ) == XmClipboardLocked ); @@ -461,7 +461,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxString id = chosenFormat.GetId(); while( ( retval = XmClipboardInquireLength( xdisplay, xwindow, - wxConstCast(id.c_str(), char), + wxConstCast(id.mb_str(), char), &length ) ) == XmClipboardLocked ); if( retval != XmClipboardSuccess ) @@ -470,7 +470,7 @@ bool wxClipboard::GetData( wxDataObject& data ) wxCharBuffer buf(length); while( ( retval = XmClipboardRetrieve( xdisplay, xwindow, - wxConstCast(id.c_str(), char), + wxConstCast(id.mb_str(), char), (XtPointer)buf.data(), length, &dummy1, &dummy2 ) ) == XmClipboardLocked );