Unicode-enabled the STC sample

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

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index f3eb66e6ede0ffcb81edb94423f6ca1725cfe491..9bd9307194685a5016172fe5e1324437e83dd04b 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -26,15 +26,22 @@
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
 
+#include "wx/listimpl.cpp"
+WX_DEFINE_LIST(wxDataObjectList);
+
+#ifdef __VMS__
+#pragma message disable nosimpint
+#endif
 #include <Xm/Xm.h>
 #include <Xm/CutPaste.h>
+#ifdef __VMS__
+#pragma message enable nosimpint
+#endif
 
 #include <string.h>
 
-#if !USE_SHARED_LIBRARY
 // IMPLEMENT_DYNAMIC_CLASS(wxClipboard, wxObject)
 // IMPLEMENT_ABSTRACT_CLASS(wxClipboardClient, wxObject)
-#endif
 
 static bool gs_clipboardIsOpen = FALSE;
 
@@ -95,7 +102,7 @@ bool wxIsClipboardFormatAvailable(wxDataFormat dataFormat)
         return TRUE;
 }
 
-bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int width, int height)
+bool wxSetClipboardData(wxDataFormat dataFormat, wxObject *obj, int WXUNUSED(width), int WXUNUSED(height))
 {
     if (dataFormat != wxDF_TEXT)
         return FALSE;
@@ -213,13 +220,13 @@ wxDataFormat  wxEnumClipboardFormats(wxDataFormat dataFormat)
        return wxDF_INVALID;
 }
 
-wxDataFormat  wxRegisterClipboardFormat(char *formatName)
+wxDataFormat  wxRegisterClipboardFormat(char *WXUNUSED(formatName))
 {
     // Not supported
     return (wxDataFormat) wxDF_INVALID;
 }
 
-bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int maxCount)
+bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int WXUNUSED(maxCount))
 {
     // Only wxDF_TEXT supported
     if (dataFormat == wxDF_TEXT)
@@ -237,8 +244,6 @@ bool wxGetClipboardFormatName(wxDataFormat dataFormat, char *formatName, int max
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
-wxClipboard* wxTheClipboard = (wxClipboard*) NULL;
-
 wxClipboard::wxClipboard()
 {
     m_open = FALSE;
@@ -251,12 +256,12 @@ wxClipboard::~wxClipboard()
 
 void wxClipboard::Clear()
 {
-    wxNode* node = m_data.First();
+    wxDataObjectList::Node* node = m_data.GetFirst();
     while (node)
     {
-        wxDataObject* data = (wxDataObject*) node->Data();
+        wxDataObject* data = node->GetData();
         delete data;
-        node = node->Next();
+        node = node->GetNext();
     }
     m_data.Clear();
 }
@@ -364,10 +369,14 @@ bool wxClipboard::GetData( wxDataObject& data )
 */
         default:
         {
-            return FALSE;
+#ifndef __VMS
+          // VMS complains that this statement is/causes unreachability
+          return FALSE;
+#endif
         }
     }
-    return FALSE;
+   
+   return FALSE;
 }
 
 #if 0