passing CRTFLAG to subordinant makes

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

diff --git a/src/motif/dataobj.cpp b/src/motif/dataobj.cpp
index b41b06164e6d5407ba9aca50b953b99bdee6e496..1a0a4f491306b53ac8961eee6c9a55c4656c4c18 100644 (file)
--- a/src/motif/dataobj.cpp
+++ b/src/motif/dataobj.cpp
@@ -4,13 +4,17 @@
 // Author:      Julian Smart
 // Id:          $Id$
 // Copyright:   (c) 1998 Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 #pragma implementation "dataobj.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_CLIPBOARD
+
 #include "wx/dataobj.h"
 #include "wx/app.h"
 
@@ -85,7 +89,7 @@ wxDataFormat::wxDataFormat( const Atom atom )
         m_type = wxDF_PRIVATE;
        m_id = XGetAtomName( (Display*) wxGetDisplay(),  m_atom );
 
-       if (m_id == _T("file:ALL"))
+       if (m_id == wxT("file:ALL"))
        {
            m_type = wxDF_FILENAME;
        }
@@ -98,21 +102,21 @@ void wxDataFormat::SetType( wxDataFormatId type )
 
     if (m_type == wxDF_TEXT)
     {
-        m_id = _T("STRING");
+        m_id = wxT("STRING");
     }
     else
     if (m_type == wxDF_BITMAP)
     {
-        m_id = _T("BITMAP");
+        m_id = wxT("BITMAP");
     }
     else
     if (m_type == wxDF_FILENAME)
     {
-        m_id = _T("file:ALL");
+        m_id = wxT("file:ALL");
     }
     else
     {
-       wxFAIL_MSG( _T("invalid dataformat") );
+       wxFAIL_MSG( wxT("invalid dataformat") );
     }
 
     m_hasAtom = FALSE;
@@ -155,7 +159,7 @@ Atom wxDataFormat::GetAtom()
 */
         if (m_type == wxDF_PRIVATE)
         {
-            m_atom = XInternAtom( (Display*) wxGetDisplay(), MBSTRINGCAST m_id.mbc_str(), FALSE );
+            m_atom = XInternAtom( (Display*) wxGetDisplay(), wxMBSTRINGCAST m_id.mbc_str(), FALSE );
         }
        else
        if (m_type == wxDF_FILENAME)
@@ -264,7 +268,7 @@ void wxPrivateDataObject::Free()
 
 wxPrivateDataObject::wxPrivateDataObject()
 {
-    wxString id = _T("application/");
+    wxString id = wxT("application/");
     id += wxTheApp->GetAppName();
 
     m_format.SetId( id );
@@ -298,3 +302,4 @@ void wxPrivateDataObject::WriteData( const void *data, void *dest ) const
     memcpy( dest, data, GetSize() );
 }
 
+#endif // wxUSE_CLIPBOARD