X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5b6aa0ff15be125c6f5f641e586002ec0c0330a2..9f6af110ffc427b7cd660523f693105176fe63c4:/src/motif/clipbrd.cpp diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp index 21df675bf2..0cc48a40f0 100644 --- a/src/motif/clipbrd.cpp +++ b/src/motif/clipbrd.cpp @@ -14,6 +14,10 @@ #pragma implementation "clipbrd.h" #endif +#include "wx/defs.h" + +#if wxUSE_CLIPBOARD + #include "wx/app.h" #include "wx/frame.h" #include "wx/bitmap.h" @@ -203,16 +207,16 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len) wxDataFormat wxEnumClipboardFormats(wxDataFormat dataFormat) { // Only wxDF_TEXT supported - if (dataFormat == (wxDataFormat) 0) + if (dataFormat == wxDF_TEXT) return wxDF_TEXT; else - return (wxDataFormat) 0; + return wxDF_INVALID; } wxDataFormat wxRegisterClipboardFormat(char *formatName) { // Not supported - return (wxDataFormat) 0; + return (wxDataFormat) wxDF_INVALID; } bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount) @@ -281,6 +285,7 @@ bool wxClipboard::SetData( wxDataObject *data ) return wxSetClipboardData(data->GetFormat(), (wxObject*) (const char*) str); break; } +/* case wxDF_BITMAP: case wxDF_DIB: { @@ -289,6 +294,7 @@ bool wxClipboard::SetData( wxDataObject *data ) return wxSetClipboardData(data->GetFormat(), & bitmap); break; } +*/ default: { return FALSE; @@ -332,6 +338,7 @@ bool wxClipboard::GetData( wxDataObject *data ) return FALSE; break; } +/* case wxDF_BITMAP: case wxDF_DIB: { @@ -347,6 +354,7 @@ bool wxClipboard::GetData( wxDataObject *data ) return FALSE; break; } +*/ default: { return FALSE; @@ -525,3 +533,4 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time) } #endif +#endif // wxUSE_CLIPBOARD