From bcd055ae108a30299fa278f3fe774f52414eb3df Mon Sep 17 00:00:00 2001 From: Jouk Jansen Date: Fri, 25 Aug 2000 08:00:04 +0000 Subject: [PATCH] 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 | 4 ++++ src/motif/app.cpp | 5 +++++ src/motif/bitmap.cpp | 4 ++++ src/motif/bmpbuttn.cpp | 4 ++++ src/motif/button.cpp | 4 ++++ src/motif/checkbox.cpp | 4 ++++ src/motif/choice.cpp | 2 +- src/motif/dialog.cpp | 7 +++++++ src/motif/filedlg.cpp | 6 ++++++ src/motif/msgdlg.cpp | 1 + src/motif/radiobox.cpp | 4 ++++ src/motif/radiobut.cpp | 4 ++++ src/motif/statbox.cpp | 4 ++++ src/motif/stattext.cpp | 4 ++++ src/motif/textctrl.cpp | 4 ++++ src/motif/utils.cpp | 4 ++++ src/motif/window.cpp | 4 ++-- 17 files changed, 66 insertions(+), 3 deletions(-) diff --git a/src/generic/scrolwin.cpp b/src/generic/scrolwin.cpp index f73c8875c8..18939cb0b8 100644 --- 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 1cba260bf5..d1899f78a6 100644 --- 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 76aa578d77..524d851c60 100644 --- 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 8abd0e2167..374b8db63b 100644 --- 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 95f4f5b009..eb0af12804 100644 --- 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 32b1413b6a..f6226acfd4 100644 --- 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 a43d00a38a..a25d112e25 100644 --- 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 cfd12bece7..7e8aaf5637 100644 --- 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 f01b0fbb19..afbaa2d710 100644 --- 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 6b7e61f69f..ca78e9a53c 100644 --- a/src/motif/msgdlg.cpp +++ b/src/motif/msgdlg.cpp @@ -22,6 +22,7 @@ // ---------------------------------------------------------------------------- #ifdef __VMS +#define XtDisplay XTDISPLAY #pragma message disable nosimpint #include #endif diff --git a/src/motif/radiobox.cpp b/src/motif/radiobox.cpp index 0fbaa83a5e..3f2f7b5fd6 100644 --- 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 7e14e8d11c..51b1241ba5 100644 --- 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 d0af7ee303..b5012e9dce 100644 --- 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 537e5f5750..3b7b342e6b 100644 --- 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 07bd42afba..ce98355f14 100644 --- 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 #include #include diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 3827520517..2194b1d835 100644 --- 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 28768bbaa0..0f9a3f6986 100644 --- 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" -- 2.47.2