include vms_jackets.h directly from wx/platform.h instead of doing it before wx/wxpre...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 2c1a40d9435ab5918252c679d5682b851e7c01cd..8bdae42935c3d76b9fb9602138435bee6a988f32 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -20,7 +20,15 @@
     are included
 */
 #ifdef __MWERKS__
     are included
 */
 #ifdef __MWERKS__

-#    include <stddef.h>
+#   include <stddef.h>
+#endif
+
+/*
+    This header must be included before anything else under VMS
+ */
+#ifdef __VMS
+#   include <vms_jackets.h>
+#   undef ConnectionNumber

 #endif
 
 /*
 #endif
 
 /*

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 33cf2dc6a0e76688f7ab048bade8bd84cb995280..e23081e0cc0ab954a516ef5df35527d5773991aa 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __VMS
-// 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -400,10 +394,10 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 
 
     bool init_result;
 
 
     bool init_result;

+    int i;

 
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert
 
 #if wxUSE_UNICODE
     // gtk_init() wants UTF-8, not wchar_t, so convert

-    int i;

     char **argvGTK = new char *[argc_ + 1];
     for ( i = 0; i < argc_; i++ )
     {
     char **argvGTK = new char *[argc_ + 1];
     for ( i = 0; i < argc_; i++ )
     {


@@ -463,7 +457,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
         wxArrayString opt, desc;
         m_traits->GetStandardCmdLineOptions(opt, desc);
 
         wxArrayString opt, desc;
         m_traits->GetStandardCmdLineOptions(opt, desc);
 

-        for ( int i = 0; i < argc_; i++ )
+        for ( i = 0; i < argc_; i++ )

         {
             // leave just the names of the options with values
             const wxString str = wxString(argv_[i]).BeforeFirst('=');
         {
             // leave just the names of the options with values
             const wxString str = wxString(argv_[i]).BeforeFirst('=');

diff --git a/src/gtk1/app.cpp b/src/gtk1/app.cpp
index 6c57967a5f8e2c5238a41f02e372da7099018680..e0d50295b06b7a27675381a249c2c438f40f0567 100644 (file)
--- a/src/gtk1/app.cpp
+++ b/src/gtk1/app.cpp
@@ -7,12 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __VMS
-// 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"