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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50982 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-01-01 20:38:33 +00:00 · 2008-01-01 20:38:33 +00:00 · 455f7c8205
commit 455f7c8205
parent 95883d6c0f
27 changed files with 9 additions and 108 deletions
--- 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.
--- 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
--- 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
--- 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__
--- 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
--- 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__
--- 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
--- 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
--- 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
--- 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"
--- 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
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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
--- 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
--- 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>
--- 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
--- 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"
--- 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>
--- 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
--- 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

--- 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
--- 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"
--- 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"