Committing in .

 Updating/repairing OpenVMS compile support

 Modified Files:
 	wxWindows/setup.h_vms wxWindows/src/common/descrip.mms
 	wxWindows/src/gtk/app.cpp
 ----------------------------------------------------------------------

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

diff --git a/setup.h_vms b/setup.h_vms
index 37708a725dec548785651b79f2ddc3b3d960abb2..5d0bdd3895fea53b12efc8f863fbebc32e86fe5e 100644 (file)
--- a/setup.h_vms
+++ b/setup.h_vms
@@ -169,6 +169,15 @@
  */
 #define HAVE_CONST_CAST 1
 
+/*
+ * Define if your compiler has std::wstring
+ */
+/* #unfine HAVE_STD_WSTRING */
+/*
+ * Define if your compiler has compilant std::string::compare
+ */
+/* #undef HAVE_STD_STRING_COMPARE */
+
 /*
  * use STL for containers and wxString
  */
@@ -177,6 +186,10 @@
  * Use regex support
  */
 #define wxUSE_REGEX 0
+/*
+ * Use XML support
+ */
+#define wxUSE_XML 1
 /*
  * Use zlib
  */
@@ -686,6 +699,17 @@
  */
 #define wxUSE_UNICODE_MSLU 0
 
+/*
+ * Set to 1 to compile MS Windows XP theme engine support
+ */
+/* #define wxUSE_UXTHEME 1 */
+
+/*
+ *  Set to 1 to auto-adapt to MS Windows XP themes where possible
+ * (notably, wxNotebook pages)
+ */
+/* #define wxUSE_UXTHEME_AUTO 1*/
+
 /*
  * Use wxURL class
  */
@@ -1164,6 +1188,9 @@
 /* Define if you have the <w32api.h> header file (mingw,cygwin).  */
 #undef HAVE_W32API_H
 
+/* Define if you have the <esd.h> header file.  */
+/* #undef HAVE_ESD_H */
+
 /* Define if you have wcsrtombs() function */
 #define HAVE_WCSRTOMBS 1
 

diff --git a/src/common/descrip.mms b/src/common/descrip.mms
index 294bb386cc9bfb9f2ba5337fb766197293e1c50f..4d009eafbcfd8e5d370520fb91821178f01967a1 100644 (file)
--- a/src/common/descrip.mms
+++ b/src/common/descrip.mms
@@ -132,6 +132,7 @@ OBJECTS1=fs_inet.obj,\
                process.obj,\
                protocol.obj,\
                quantize.obj,\
+               rendcmn.obj,\
                sckaddr.obj,\
                sckfile.obj,\
                sckipc.obj,\
@@ -262,6 +263,7 @@ SOURCES = \
                process.cpp,\
                protocol.cpp,\
                quantize.cpp,\
+               rendcmn.cpp,\
                rgncmn.cpp,\
                sckaddr.cpp,\
                sckfile.cpp,\
@@ -412,6 +414,7 @@ prntbase.obj : prntbase.cpp
 process.obj : process.cpp
 protocol.obj : protocol.cpp
 quantize.obj : quantize.cpp
+rendcmn.obj : rendcmn.cpp
 rgncmn.obj : rgncmn.cpp
 sckaddr.obj : sckaddr.cpp
 sckfile.obj : sckfile.cpp

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index ab2400fc2f728b10aa58bcae780b1b988ecd0f75..dad9249bc9287f200a3cc43b70979b6521b6fc34 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -11,14 +11,15 @@
     #pragma implementation "app.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
 #ifdef __VMS
-#include <vms_jackets.h>
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>
 #undef ConnectionNumber
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index ab2400fc2f728b10aa58bcae780b1b988ecd0f75..dad9249bc9287f200a3cc43b70979b6521b6fc34 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -11,14 +11,15 @@
     #pragma implementation "app.h"
 #endif
 
-// For compilers that support precompilation, includes "wx.h".
-#include "wx/wxprec.h"
-
 #ifdef __VMS
-#include <vms_jackets.h>
+// vms_jackets.h should for proper working be included before anything else
+# include <vms_jackets.h>
 #undef ConnectionNumber
 #endif
 
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
 #include "wx/app.h"
 #include "wx/gdicmn.h"
 #include "wx/utils.h"