more work on fixing wxEntry() and ANSI/Unicode cmd line args mess
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21520 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -95,7 +95,7 @@ public:
|
||||
// reason, you must override it (instead of just overriding OnInit(), as
|
||||
// usual, for app-specific initializations), do not forget to call the base
|
||||
// class version!
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
|
||||
// Called before OnRun(), this is a good place to do initialization -- if
|
||||
// anything fails, return false from here to prevent the program from
|
||||
@@ -314,7 +314,7 @@ public:
|
||||
// very first initialization function
|
||||
//
|
||||
// Override: very rarely
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
|
||||
// a platform-dependent version of OnInit(): the code here is likely to
|
||||
// depend on the toolkit. default version does nothing.
|
||||
|
@@ -66,7 +66,7 @@ public:
|
||||
// Returns TRUE if more idle time is requested.
|
||||
bool SendIdleEvents(wxWindowCocoa* win);
|
||||
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
virtual bool OnInit();
|
||||
|
@@ -58,7 +58,7 @@ public:
|
||||
bool SendIdleEvents();
|
||||
bool SendIdleEvents( wxWindow* win );
|
||||
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
static bool InitialzeVisual();
|
||||
|
@@ -58,7 +58,7 @@ public:
|
||||
bool SendIdleEvents();
|
||||
bool SendIdleEvents( wxWindow* win );
|
||||
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
static bool InitialzeVisual();
|
||||
|
@@ -24,8 +24,9 @@
|
||||
// this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
|
||||
// hadn't been used a dummy default application object is created
|
||||
//
|
||||
// note that the parameters may be modified
|
||||
extern bool WXDLLEXPORT wxEntryStart(int argc, wxChar **argv);
|
||||
// note that the parameters may be modified, this is why we pass them by
|
||||
// reference!
|
||||
extern bool WXDLLEXPORT wxEntryStart(int& argc, wxChar **argv);
|
||||
|
||||
// free the resources allocated by the library in wxEntryStart() and shut it
|
||||
// down (wxEntryStart() may be called again afterwards if necessary)
|
||||
@@ -41,7 +42,7 @@ extern void WXDLLEXPORT wxEntryCleanup();
|
||||
// but this one always exists under all platforms
|
||||
//
|
||||
// returns the program exit code
|
||||
extern int WXDLLEXPORT wxEntry(int argc, wxChar **argv);
|
||||
extern int WXDLLEXPORT wxEntry(int& argc, wxChar **argv);
|
||||
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
@@ -91,7 +91,7 @@ protected:
|
||||
public:
|
||||
|
||||
// Implementation
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
bool IsExiting() { return !m_keepGoing ; }
|
||||
|
@@ -54,7 +54,7 @@ public:
|
||||
bool SendIdleEvents();
|
||||
bool SendIdleEvents(wxWindow* win);
|
||||
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
virtual bool Yield(bool onlyIfNeeded = FALSE);
|
||||
|
@@ -82,7 +82,7 @@ protected:
|
||||
|
||||
public:
|
||||
// Implementation
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
// Motif-specific
|
||||
|
@@ -36,7 +36,7 @@ public:
|
||||
virtual ~wxApp();
|
||||
|
||||
// override base class (pure) virtuals
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
virtual int MainLoop();
|
||||
|
@@ -126,7 +126,7 @@ private:
|
||||
public:
|
||||
|
||||
// Implementation
|
||||
virtual bool Initialize(int argc, wxChar **argv);
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp(void);
|
||||
|
||||
static bool RegisterWindowClasses(HAB vHab);
|
||||
|
@@ -89,7 +89,7 @@ protected:
|
||||
|
||||
public:
|
||||
// Implementation
|
||||
virtual bool Initialize();
|
||||
virtual bool Initialize(int& argc, wxChar **argv);
|
||||
virtual void CleanUp();
|
||||
|
||||
void DeletePendingObjects();
|
||||
|
Reference in New Issue
Block a user