X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f380e251aad15c3c764dbcaf703b05eb202efa30..e9e8b38179b147dd04f5c19af7e56a94342e93a7:/include/wx/init.h diff --git a/include/wx/init.h b/include/wx/init.h index ad8e96da2c..90304ef918 100644 --- a/include/wx/init.h +++ b/include/wx/init.h @@ -55,15 +55,16 @@ extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv); // ---------------------------------------------------------------------------- // Using the library without (explicit) application object: you may avoid using -// DECLARE_APP and IMPLEMENT_APP macros and call the functions below instead at +// wxDECLARE_APP and wxIMPLEMENT_APP macros and call the functions below instead at // the program startup and termination // ---------------------------------------------------------------------------- // initialize the library (may be called as many times as needed, but each // call to wxInitialize() must be matched by wxUninitialize()) -extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, wxChar **argv = NULL); +extern bool WXDLLIMPEXP_BASE wxInitialize(); +extern bool WXDLLIMPEXP_BASE wxInitialize(int argc, wxChar **argv); #if wxUSE_UNICODE -extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, char **argv = NULL); +extern bool WXDLLIMPEXP_BASE wxInitialize(int argc, char **argv); #endif // clean up -- the library can't be used any more after the last call to @@ -76,13 +77,18 @@ class WXDLLIMPEXP_BASE wxInitializer { public: // initialize the library - wxInitializer(int argc = 0, wxChar **argv = NULL) + wxInitializer() + { + m_ok = wxInitialize(); + } + + wxInitializer(int argc, wxChar **argv) { m_ok = wxInitialize(argc, argv); } #if wxUSE_UNICODE - wxInitializer(int argc = 0, char **argv = NULL) + wxInitializer(int argc, char **argv) { m_ok = wxInitialize(argc, argv); }