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

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"
 

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"

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"

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__

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"

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"
 

src/motif/choice.cpp

@@ -13,7 +13,7 @@
 #pragma implementation "choice.h"
 #endif
 
-#ifdef VMS
+#ifdef __VMS
 #define XtDisplay XTDISPLAY
 #define XtParent XTPARENT
 #endif

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"

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"

src/motif/msgdlg.cpp

@@ -22,6 +22,7 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __VMS
+#define XtDisplay XTDISPLAY
 #pragma message disable nosimpint
 #include <wx/vms_x_fix.h>
 #endif

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"
 

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"
 

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"
 

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"
 

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>

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"

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"