switch /MD /MDd depend on FINAL

[wxWidgets.git] / src / motif / clipbrd.cpp

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 8156b69bc78fde38e1823e2031c84c3b13a469e7..84dca0b0f0891ab83f08108fe8e6724c933c12de 100644 (file)
--- 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"
@@ -81,7 +85,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
         window = XtWindow( (Widget) wxTheApp->GetTopWindow()->GetTopWidget() );
 
     int success = XmClipboardRetrieve((Display*) wxGetDisplay(),
-      window, "TEXT", (XtPointer) 0, 0, & numBytes, & privateId) ;
+      window, "TEXT(", (XtPointer) 0, 0, & numBytes, & privateId) ;
 
     // Assume only text is supported. If we have anything at all,
     // or the clipboard is locked so we're not sure, we say we support it.
@@ -124,7 +128,7 @@ bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int h
       XmClipboardCopy((Display*) wxGetDisplay(),
        window, 
        itemId,
-       "TEXT",
+       "TEXT(",
        (XtPointer) data,
        strlen(data) + 1,
        0,
@@ -167,7 +171,7 @@ wxObject *wxGetClipboardData(wxDataFormat dataFormat, long *len)
        }
         result = XmClipboardRetrieve((Display*) wxGetDisplay(),
           window,
-          "TEXT",
+          "TEXT(",
           (XtPointer) data,
           currentDataSize,
           &numBytes,
@@ -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)
@@ -220,7 +224,7 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int max
     // Only wxDF_TEXT supported
     if (dataFormat == wxDF_TEXT)
     {
-       strcpy(formatName, "TEXT");
+       strcpy(formatName, "TEXT(");
        return TRUE;
     }
     else
@@ -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;
@@ -306,7 +312,7 @@ void wxClipboard::Close()
     wxCloseClipboard();
 }
 
-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString& WXUNUSED(id) )
+bool wxClipboard::IsSupported( wxDataFormat format)
 {
     return wxIsClipboardFormatAvailable(format);
 }
@@ -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;
@@ -405,7 +413,7 @@ wxClipboard::~wxClipboard()
 
 static int FormatStringToID(char *str)
 {
-    if (!strcmp(str, "TEXT"))
+    if (!strcmp(str, "TEXT("))
         return wxDF_TEXT;
     
     return wxRegisterClipboardFormat(str);
@@ -491,7 +499,7 @@ char *wxClipboard::GetClipboardString(long time)
     char *str;
     long length;
     
-    str = GetClipboardData("TEXT", &length, time);
+    str = GetClipboardData("TEXT(", &length, time);
     if (!str) {
         str = new char[1];
         *str = 0;
@@ -508,7 +516,7 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
         else
             return NULL;
     } else if (cbString) {
-        if (!strcmp(format, "TEXT"))
+        if (!strcmp(format, "TEXT("))
             return copystring(cbString);
         else
             return NULL;
@@ -525,3 +533,4 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
 }
 #endif
 
+#endif // wxUSE_CLIPBOARD