Committing in .

 Modified Files:
 	wxWindows/src/generic/scrolwin.cpp wxWindows/src/motif/app.cpp
 	wxWindows/src/motif/bitmap.cpp
 	wxWindows/src/motif/bmpbuttn.cpp
 	wxWindows/src/motif/button.cpp
 	wxWindows/src/motif/checkbox.cpp
 	wxWindows/src/motif/choice.cpp wxWindows/src/motif/dialog.cpp
 	wxWindows/src/motif/filedlg.cpp wxWindows/src/motif/msgdlg.cpp
 	wxWindows/src/motif/radiobox.cpp
 	wxWindows/src/motif/radiobut.cpp
 	wxWindows/src/motif/statbox.cpp
 	wxWindows/src/motif/stattext.cpp
 	wxWindows/src/motif/textctrl.cpp wxWindows/src/motif/utils.cpp
 	wxWindows/src/motif/window.cpp

 More patches for VMS only

----------------------------------------------------------------------

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp
index f73c8875c8ff044fe9e3eb8923989002b2130669..18939cb0b894c2e253ab51c9496ae6cb2bb848ee 100644 (file)
--- a/src/generic/scrolwin.cpp
+++ b/src/generic/scrolwin.cpp
@@ -21,6 +21,10 @@
     #pragma implementation "scrolwin.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 1cba260bf5301fed46647f3dd8b219d9c54ebac7..d1899f78a65165d5c4444905d590114e2b620bf0 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -13,6 +13,11 @@
     #pragma implementation "app.h"
 #endif
 
+#ifdef __VMS
+#define XtParent XTPARENT
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/frame.h"
 #include "wx/app.h"
 #include "wx/utils.h"

diff --git a/src/motif/bitmap.cpp b/src/motif/bitmap.cpp
index 76aa578d775550802c658a805445ede07a65cdb1..524d851c606b6297f659cd22791501f23638a0fc 100644 (file)
--- a/src/motif/bitmap.cpp
+++ b/src/motif/bitmap.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "bitmap.h"
 #endif
 
+#ifdef __VMS
+#define XtParent XTPARENT
+#endif
+
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/palette.h"

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 8abd0e2167abd531796a453fd76ad7e1f7926853..374b8db63b83f11589caeac57a0262b787ced5f6 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "bmpbuttn.h"
 #endif
 
+#ifdef __VMS
+#define XtScreen XTSCREEN
+#endif
+
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 95f4f5b009cd459b75795162965af1735698c011..eb0af12804e713b0301095b70e6a886f7c87d6c9 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "button.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/button.h"
 #include "wx/utils.h"
 #include "wx/panel.h"

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 32b1413b6a204826d7fffc1f5412d45b5c5b8aee..f6226acfd4827bcf1e698a20f734dda2bf8fd443 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "checkbox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/checkbox.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index a43d00a38a1185e9f709e2fdd3b8ade01b944430..a25d112e25548b6fc97b6052d69e3362d813bc29 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -13,7 +13,7 @@
 #pragma implementation "choice.h"
 #endif
 
-#ifdef VMS
+#ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index cfd12bece73fc1571ccef7b73a70b2c2005cac14..7e8aaf56379e4edd8690e7a35aa3602a5b1e7b54 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -13,6 +13,13 @@
 #pragma implementation "dialog.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtWindow XTWINDOW
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#endif
+
 #include "wx/dialog.h"
 #include "wx/utils.h"
 #include "wx/frame.h"

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index f01b0fbb19ea54202c4d6a93c45051afe06fb88d..afbaa2d71000995eacdae6b479ab7a036dc836e5 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -13,6 +13,12 @@
 #pragma implementation "filedlg.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#define XtParent XTPARENT
+#define XtWindow XTWINDOW
+#endif
+
 #include "wx/defs.h"
 #include "wx/utils.h"
 #include "wx/dialog.h"

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index 6b7e61f69fc9f5791bf5573a70c087e73d805760..ca78e9a53c258a22d58935a109c8e8554c458db0 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -22,6 +22,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __VMS
+#define XtDisplay XTDISPLAY
 #pragma message disable nosimpint
 #include <wx/vms_x_fix.h>
 #endif

diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp
index 0fbaa83a5e0a16f36ad23918e028275b70333406..3f2f7b5fd6915e0950fbe2fa118243517d456d96 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "radiobox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/radiobox.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 7e14e8d11c451887419efdfcd93d862f7e8c3fc3..51b1241ba5792a0c27ae5c8bf880d9e9d52e30a0 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "radiobut.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/radiobut.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index d0af7ee303c4a1c3b6601c1e23a39bdc9e1e5ca6..b5012e9dce1618b393ff487196f1184693ab3a2b 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "statbox.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/statbox.h"
 #include "wx/utils.h"
 

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 537e5f57504100770bc25913834f0f8a3d78fe6c..3b7b342e6b5164aa88ecd82fcc6b5b2fb15413de 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -13,6 +13,10 @@
 #pragma implementation "stattext.h"
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/app.h"
 #include "wx/stattext.h"
 

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 07bd42afbab746490f163fd2ea0e7807c184ec26..ce98355f14467e143f7180b3a490fe9bca16cd5c 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -21,6 +21,10 @@
     #pragma implementation "textctrl.h"
 #endif
 
+#ifdef __VMS
+#define XtParent XTPARENT
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fstream.h>

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 38275205176309437362078ec6cd67b41ed8a1bd..2194b1d8356216fef81be6a4e699a797a9c8f7fe 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -17,6 +17,10 @@
 // headers
 // ----------------------------------------------------------------------------
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#endif
+
 #include "wx/setup.h"
 #include "wx/utils.h"
 #include "wx/app.h"

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 28768bbaa0c586e21e7eafbda1857befde133570..0f9a3f6986565ddb5dfc09e13829472553c18996 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -23,8 +23,8 @@
 
 #ifdef __VMS
 #define XtDisplay XTDISPLAY
-#define XtWINDOW XTWINDOW
-#define XtSreen XTSCREEN
+#define XtWindow XTWINDOW
+#define XtScreen XTSCREEN
 #endif
 
 #include "wx/setup.h"