do VMS-specific X symbols redefinitions only once in wx/platform.h instead of doing...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 22b2469aafddbb70a492f8c80c92eebb52cd2f0e..328f4bc194dfecdfa9294f34ce0fb2dda096be18 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -640,6 +640,15 @@
 # define wxVMS_USE_STD
 #endif
 
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif
+#endif
+
 /* Choose which method we will use for updating menus
  * - in OnIdle, or when we receive a wxEVT_MENU_OPEN event.
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 0476ed31dc9ffb71acaabda2c9dba6234467ef13..00dac29274966b9d9402830f990904d086da48a2 100644 (file)
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -25,10 +25,6 @@
     #pragma hdrstop
 #endif
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/scrolwin.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index c987ef6334466ff636799769b12fc26d5d6c3f11..6208995cd0df97d15d4c513b36dde0c6349f4555 100644 (file)
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/app.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/bmpbuttn.cpp b/src/motif/bmpbuttn.cpp
index 5e94188ba4b5ce900e57de42b680b846515bce80..9ebada34b8f8952a758d7395574928f8698fb08c 100644 (file)
--- a/src/motif/bmpbuttn.cpp
+++ b/src/motif/bmpbuttn.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/bmpbuttn.h"
 
 #ifdef __VMS__

diff --git a/src/motif/bmpmotif.cpp b/src/motif/bmpmotif.cpp
index 155adc1cf4a35051668b40623793396e7bbb8fe6..525bc355a0d45256ccd34f556c516fb79a2de0aa 100644 (file)
--- a/src/motif/bmpmotif.cpp
+++ b/src/motif/bmpmotif.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/motif/bmpmotif.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/button.cpp b/src/motif/button.cpp
index 99324c3f9c0a3d0666c4ccd45a659bece0eda800..7b85a01c74b8f79e896b16e81dcc654d5975becb 100644 (file)
--- a/src/motif/button.cpp
+++ b/src/motif/button.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/button.h"
 
 #ifdef __VMS__

diff --git a/src/motif/checkbox.cpp b/src/motif/checkbox.cpp
index 42f44e24fc361a6659b1a9aecc6522bcb0caa7bb..e6fc7d7314a93455d35a7d1e4a1c812e9451a97e 100644 (file)
--- a/src/motif/checkbox.cpp
+++ b/src/motif/checkbox.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/checkbox.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/choice.cpp b/src/motif/choice.cpp
index 040553316233f6a45b66b88888758ba6ceaae638..4a05b6829d5954bedc6ae7e0ca0839e26dd4c030 100644 (file)
--- a/src/motif/choice.cpp
+++ b/src/motif/choice.cpp
@@ -14,11 +14,6 @@
 
 #if wxUSE_CHOICE
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#endif
-
 #include "wx/choice.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/dialog.cpp b/src/motif/dialog.cpp
index 59b8baf0778348fa97b3de240586a41727de2e0a..ceb4ca922e20df771fd869b6ed7faee5a0cb6854 100644 (file)
--- a/src/motif/dialog.cpp
+++ b/src/motif/dialog.cpp
@@ -12,13 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/dialog.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/evtloop.cpp b/src/motif/evtloop.cpp
index 6886f5d3e187facab4562bd2e9b7770fe980131f..367982dcb83ec4c41571bbc330639584ff7746a9 100644 (file)
--- a/src/motif/evtloop.cpp
+++ b/src/motif/evtloop.cpp
@@ -20,11 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/event.h"
     #include "wx/app.h"

diff --git a/src/motif/filedlg.cpp b/src/motif/filedlg.cpp
index 889ee87e140f96ce2cd6cb5a9d7280943237955f..490f92fb23403da6ee26f75f3ef7248d87223f2a 100644 (file)
--- a/src/motif/filedlg.cpp
+++ b/src/motif/filedlg.cpp
@@ -12,12 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtWindow XTWINDOW
-#endif
-
 #include "wx/filedlg.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/frame.cpp b/src/motif/frame.cpp
index 87af9ad8ef5a4aaae622f0ee063e15827242e553..355b54f48a4ab7273bc1b0ac58809fed127233f4 100644 (file)
--- a/src/motif/frame.cpp
+++ b/src/motif/frame.cpp
@@ -20,12 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-
 #include "wx/frame.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/listbox.cpp b/src/motif/listbox.cpp
index f23c8b761173e951ea256937573eb9d605e77185..4d593370235acbf183fc69025b3c221f13c2e04e 100644 (file)
--- a/src/motif/listbox.cpp
+++ b/src/motif/listbox.cpp
@@ -24,11 +24,6 @@
     #include "wx/arrstr.h"
 #endif
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#define XtDisplay XTDISPLAY
-#endif
-
 #ifdef __VMS__
 #pragma message disable nosimpint
 #endif

diff --git a/src/motif/mdi.cpp b/src/motif/mdi.cpp
index 2f18487ea411ac22e23b82cb2bbb016e0091bfaa..998bc5d107c1a786f5e6c4fcfd606d4503972324 100644 (file)
--- a/src/motif/mdi.cpp
+++ b/src/motif/mdi.cpp
@@ -12,11 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#endif
-
 #include "wx/mdi.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/menu.cpp b/src/motif/menu.cpp
index 68eee40b912576df6d7ed11c7e7060e78bcc65fe..6eae7b96dd3e8d4f6837ad6c1c9da1e6c8dfe3d4 100644 (file)
--- a/src/motif/menu.cpp
+++ b/src/motif/menu.cpp
@@ -33,8 +33,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
 #endif
 #include <Xm/Label.h>
 #include <Xm/LabelG.h>

diff --git a/src/motif/msgdlg.cpp b/src/motif/msgdlg.cpp
index df115f63e7f00cfc7b6c86207e69839aeb0e1044..49b7fb846895cdc9f42e369fc438c0324b6cf83a 100644 (file)
--- a/src/motif/msgdlg.cpp
+++ b/src/motif/msgdlg.cpp
@@ -21,7 +21,6 @@
 #include "wx/wxprec.h"
 
 #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 00bcec5189450d9db4643d2ab19888f616eadc42..00303033a4a737a972f876b8fd75cd703c4ff07e 100644 (file)
--- a/src/motif/radiobox.cpp
+++ b/src/motif/radiobox.cpp
@@ -14,10 +14,6 @@
 
 #if wxUSE_RADIOBOX
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/radiobox.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/radiobut.cpp b/src/motif/radiobut.cpp
index 4ac378762e70128b379287e333063aadf6ff271f..5c38eaf30d67c00913d61d272037ebc4b066c01b 100644 (file)
--- a/src/motif/radiobut.cpp
+++ b/src/motif/radiobut.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/radiobut.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/scrolbar.cpp b/src/motif/scrolbar.cpp
index d54a1f1d80ff78b8c319c8897e8842d846121afb..587be3ca89c15c7acafdeed8b6a333ee20f1e0f6 100644 (file)
--- a/src/motif/scrolbar.cpp
+++ b/src/motif/scrolbar.cpp
@@ -16,7 +16,6 @@
 
 #ifdef __VMS__
 #pragma message disable nosimpint
-#define XtDisplay XTDISPLAY
 #endif
 #include <Xm/Xm.h>
 #include <Xm/ScrollBar.h>

diff --git a/src/motif/statbox.cpp b/src/motif/statbox.cpp
index 22deeec8c93a5a3ce92e28faffa68dd29c662ac5..6fdcb4c5d24cbbf44a18f4d271dc125e2cd07828 100644 (file)
--- a/src/motif/statbox.cpp
+++ b/src/motif/statbox.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/statbox.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/stattext.cpp b/src/motif/stattext.cpp
index 3526a2bf2da3a9924c44b60436abdc035ba4d4e5..5ddee743906ae752bb88abe5ce82c1bcdb24abea 100644 (file)
--- a/src/motif/stattext.cpp
+++ b/src/motif/stattext.cpp
@@ -12,10 +12,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #if wxUSE_STATTEXT
 
 #include "wx/stattext.h"

diff --git a/src/motif/textctrl.cpp b/src/motif/textctrl.cpp
index 7d9b41ed0b7f12aada3a9ad3ddb7c5a95a34b872..666da47caac2f98ac1d1954909aeb54dc7dda4af 100644 (file)
--- a/src/motif/textctrl.cpp
+++ b/src/motif/textctrl.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtParent XTPARENT
-#endif
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>

diff --git a/src/motif/toolbar.cpp b/src/motif/toolbar.cpp
index cbb8223d823b3bc92b968cee09ec1862d40ebe53..b6cebddc1b88d0cb4326fed55a800c80a991347d 100644 (file)
--- a/src/motif/toolbar.cpp
+++ b/src/motif/toolbar.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/toolbar.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/toplevel.cpp b/src/motif/toplevel.cpp
index f21849c3d59b8f2ef3bf44323759b20efae1ec79..4f219ee426833ae5cdfa87020835b6ab68347712 100644 (file)
--- a/src/motif/toplevel.cpp
+++ b/src/motif/toplevel.cpp
@@ -29,10 +29,6 @@
 #endif
 
 #ifdef __VMS__
-#define XtDisplay XTDISPLAY
-#define XtParent XTPARENT
-#define XtScreen XTSCREEN
-#define XtWindow XTWINDOW
 #pragma message disable nosimpint
 #endif
 

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 595e14696abcd9ba33e3c940e331bdebbcdcb524..2453e7bd0d49ffb97f0aff2815dce161e0a20564 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -20,10 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/utils.h"
 
 #ifndef WX_PRECOMP

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index 95000fe071bf0820edd4c452e402f48e3ae6804c..211dc3bf35639359290bc02d8a0608960fbeb76e 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -20,12 +20,6 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#define XtWindow XTWINDOW
-#define XtScreen XTSCREEN
-#endif
-
 #ifndef WX_PRECOMP
     #include "wx/hash.h"
     #include "wx/log.h"

diff --git a/src/x11/utilsx.cpp b/src/x11/utilsx.cpp
index c01eeb8af8195e2b5a7f149a9fc84cd695e1e246..9bc793e343cc1aa57b4536d39d72e60e2c72a41f 100644 (file)
--- a/src/x11/utilsx.cpp
+++ b/src/x11/utilsx.cpp
@@ -14,7 +14,6 @@
 
 #ifdef __VMS
 #define XShapeQueryExtension XSHAPEQUERYEXTENSION
-#define XtDisplay XTDISPLAY
 #endif
 
 #include "wx/x11/privx.h"