DLL compilation fixes

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

diff --git a/src/motif/clipbrd.cpp b/src/motif/clipbrd.cpp
index 9c09d7ff2bd754221646b0ca70975e55e7042ba0..275c02fd53dcb1743168c2ac876b9e3bbc3ae1aa 100644 (file)
--- a/src/motif/clipbrd.cpp
+++ b/src/motif/clipbrd.cpp
@@ -14,6 +14,15 @@
 #pragma implementation "clipbrd.h"
 #endif
 
+#ifdef __VMS
+#include "wx/vms_x_fix.h"
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
+#define XtParent XTPARENT
+#define XtIsRealized XTISREALIZED
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/defs.h"
 
 #if wxUSE_CLIPBOARD
@@ -27,6 +36,7 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
+
 #endif
 #include <Xm/Xm.h>
 #include <Xm/CutPaste.h>
@@ -163,9 +173,13 @@ struct wxDataIdToDataObject
 WX_DEFINE_LIST(wxDataObjectList);
 WX_DEFINE_LIST(wxDataIdToDataObjectList);
 
+#if wxCHECK_LESSTIF()
+static void wxClipboardCallback( Widget widget, int* data_id,
+                                 int* priv, int* reason );
+#else
 static void wxClipboardCallback( Widget widget, long* data_id,
                                  long* priv, int* reason );
-
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxClipboard,wxObject)
 
@@ -217,8 +231,13 @@ bool wxClipboard::SetData( wxDataObject *data )
 wxDECLARE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 wxDEFINE_SCOPED_ARRAY( wxDataFormat, wxDataFormatScopedArray );
 
+#if wxCHECK_LESSTIF()
+void wxClipboardCallback( Widget xwidget, int* data_id,
+                          int* priv, int* reason )
+#else
 void wxClipboardCallback( Widget xwidget, long* data_id,
                           long* priv, int* reason )
+#endif
 {
     Display* xdisplay = XtDisplay( xwidget );
     Window xwindow = XtWindow( xwidget );