made wxApp::argv an object convertible to either char** or wchar_t** for better compatibility with the existing ANSI code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-11-12 22:32:23 +00:00
parent d2263bbca3
commit 541ea80f0e
15 changed files with 865 additions and 546 deletions

View File

@@ -19,6 +19,7 @@
#include "wx/event.h" // for the base class
#include "wx/build.h"
#include "wx/cmdargs.h" // for wxCmdLineArgsArray used by wxApp::argv
#include "wx/init.h" // we must declare wxEntry()
#include "wx/intl.h" // for wxLayoutDirection
@@ -316,8 +317,17 @@ public:
// command line arguments (public for backwards compatibility)
int argc;
wxChar **argv;
int argc;
// this object is implicitly convertible to either "char**" (traditional
// type of argv parameter of main()) or to "wchar_t **" (for compatibility
// with Unicode build in previous wx versions and because the command line
// can, in pr
#if wxUSE_UNICODE
wxCmdLineArgsArray argv;
#else
char **argv;
#endif
protected:
// the function which creates the traits object when GetTraits() needs it