include vms_jackets.h directly from wx/platform.h instead of doing it before wx/wxprec.h as this breaks PCH usage
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48861 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		@@ -20,7 +20,15 @@
 | 
				
			|||||||
    are included
 | 
					    are included
 | 
				
			||||||
*/
 | 
					*/
 | 
				
			||||||
#ifdef __MWERKS__
 | 
					#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
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/*
 | 
					/*
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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".
 | 
					// For compilers that support precompilation, includes "wx.h".
 | 
				
			||||||
#include "wx/wxprec.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
 | 
					#if wxUSE_UNICODE
 | 
				
			||||||
    // gtk_init() wants UTF-8, not wchar_t, so convert
 | 
					    // gtk_init() wants UTF-8, not wchar_t, so convert
 | 
				
			||||||
    int i;
 | 
					 | 
				
			||||||
    char **argvGTK = new char *[argc_ + 1];
 | 
					    char **argvGTK = new char *[argc_ + 1];
 | 
				
			||||||
    for ( i = 0; i < argc_; i++ )
 | 
					    for ( i = 0; i < argc_; i++ )
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
@@ -463,7 +457,7 @@ bool wxApp::Initialize(int& argc_, wxChar **argv_)
 | 
				
			|||||||
        wxArrayString opt, desc;
 | 
					        wxArrayString opt, desc;
 | 
				
			||||||
        m_traits->GetStandardCmdLineOptions(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
 | 
					            // leave just the names of the options with values
 | 
				
			||||||
            const wxString str = wxString(argv_[i]).BeforeFirst('=');
 | 
					            const wxString str = wxString(argv_[i]).BeforeFirst('=');
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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".
 | 
					// For compilers that support precompilation, includes "wx.h".
 | 
				
			||||||
#include "wx/wxprec.h"
 | 
					#include "wx/wxprec.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user