Committing in .

 Enabling wxX11 for OpenVMS (Phase 2)
    -partly redo and fix for prevous commit

 Modified Files:
 	wxWidgets/setup.h_vms wxWidgets/include/wx/display.h
 	wxWidgets/src/common/dpycmn.cpp
 ----------------------------------------------------------------------

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

diff --git a/include/wx/display.h b/include/wx/display.h
index 0714805e5c4af9491cf90eb5ce7158292c861cc7..835a233b23f9abb1d110f1cc3036ea0c84983ae5 100644 (file)
--- a/include/wx/display.h
+++ b/include/wx/display.h
@@ -12,7 +12,7 @@
 #ifndef _WX_DISPLAY_H_BASE_
 #define _WX_DISPLAY_H_BASE_
 
-#ifdef wxUSE_DISPLAY
+#if wxUSE_DISPLAY
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "displaybase.h"

diff --git a/setup.h_vms b/setup.h_vms
index 2801e72fdaa2bb8e481560b82fd4207e3aadeb1d..e3f32117d2b5041ef91377de8bf58e9b47deb767 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -434,7 +434,7 @@
 /*
  * Use wxDisplay class
  */
-#define wxUSE_DISPLAY !
+#define wxUSE_DISPLAY 1
 
 /*
  * Use this control

diff --git a/src/common/dpycmn.cpp b/src/common/dpycmn.cpp
index e8072554a770627d2152f65e8dd04502d0743d91..8797f81ecbc8067875b57286cd2b8ff49ba5146e 100644 (file)
--- a/src/common/dpycmn.cpp
+++ b/src/common/dpycmn.cpp
@@ -30,7 +30,7 @@
 
 #include "wx/display.h"
 
-#ifdef wxUSE_DISPLAY
+#if wxUSE_DISPLAY
 
 #include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(wxArrayVideoModes);