Added makeg295.env file for building with gcc-2.95/mingw

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

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 8156b69bc78fde38e1823e2031c84c3b13a469e7..0cc48a40f01c35107459b5b80eae9eaa13a97d85 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -14,6 +14,10 @@
 #pragma implementation "clipbrd.h"
 #endif
 
 #pragma implementation "clipbrd.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_CLIPBOARD
+

 #include "wx/app.h"
 #include "wx/frame.h"
 #include "wx/bitmap.h"
 #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
 wxDataFormat  wxEnumClipboardFormats(wxDataFormat dataFormat)
 {
     // Only wxDF_TEXT supported

-    if (dataFormat == (wxDataFormat) 0)
+    if (dataFormat == wxDF_TEXT)

        return wxDF_TEXT;
     else
        return wxDF_TEXT;
     else

-       return (wxDataFormat) 0;
+       return wxDF_INVALID;

 }
 
 wxDataFormat  wxRegisterClipboardFormat(char *formatName)
 {
     // Not supported
 }
 
 wxDataFormat  wxRegisterClipboardFormat(char *formatName)
 {
     // Not supported

-    return (wxDataFormat) 0;
+    return (wxDataFormat) wxDF_INVALID;

 }
 
 bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount)
 }
 
 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;
         }
             return wxSetClipboardData(data->GetFormat(), (wxObject*) (const char*) str);
             break;
         }

+/*

         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         case wxDF_BITMAP:
         case wxDF_DIB:
         {


@@ -289,6 +294,7 @@ bool wxClipboard::SetData( wxDataObject *data )
             return wxSetClipboardData(data->GetFormat(), & bitmap);
             break;
         }
             return wxSetClipboardData(data->GetFormat(), & bitmap);
             break;
         }

+*/

         default:
         {
             return FALSE;
         default:
         {
             return FALSE;


@@ -306,7 +312,7 @@ void wxClipboard::Close()
     wxCloseClipboard();
 }
 
     wxCloseClipboard();
 }
 

-bool wxClipboard::IsSupportedFormat( wxDataFormat format, const wxString& WXUNUSED(id) )
+bool wxClipboard::IsSupported( wxDataFormat format)

 {
     return wxIsClipboardFormatAvailable(format);
 }
 {
     return wxIsClipboardFormatAvailable(format);
 }


@@ -332,6 +338,7 @@ bool wxClipboard::GetData( wxDataObject *data )
                 return FALSE;
             break;
         }
                 return FALSE;
             break;
         }

+/*

         case wxDF_BITMAP:
         case wxDF_DIB:
         {
         case wxDF_BITMAP:
         case wxDF_DIB:
         {


@@ -347,6 +354,7 @@ bool wxClipboard::GetData( wxDataObject *data )
                 return FALSE;
             break;
         }
                 return FALSE;
             break;
         }

+*/

         default:
         {
             return FALSE;
         default:
         {
             return FALSE;


@@ -525,3 +533,4 @@ char *wxClipboard::GetClipboardData(char *format, long *length, long time)
 }
 #endif
 
 }
 #endif
 

+#endif // wxUSE_CLIPBOARD