Removed redundant code

[wxWidgets.git] / include / wx / init.h

diff --git a/include/wx/init.h b/include/wx/init.h
index 7fe4515597704523ae1e60618e17ea0c48810bde..8ceae027c8c0ce0972ad313c799b5aa734a84f23 100644 (file)
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -1,17 +1,18 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/init.h
-// Purpose:     wxWindows initialization and finalization functions
+// Purpose:     wxWidgets initialization and finalization functions
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29.06.2003
 // RCS-ID:      $Id$
-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_INIT_H_
 #define _WX_INIT_H_
 
+#include "wx/defs.h"
 #include "wx/wxchar.h"
 
 // ----------------------------------------------------------------------------
@@ -19,7 +20,7 @@
 // ----------------------------------------------------------------------------
 
 // do common initialization, return true if ok (in this case wxEntryCleanup
-// must be called later), otherwise the program can't use wxWindows at all
+// must be called later), otherwise the program can't use wxWidgets at all
 //
 // this function also creates wxTheApp as a side effect, if IMPLEMENT_APP
 // hadn't been used a dummy default application object is created
@@ -44,6 +45,13 @@ extern void WXDLLIMPEXP_BASE wxEntryCleanup();
 // returns the program exit code
 extern int WXDLLIMPEXP_BASE wxEntry(int& argc, wxChar **argv);
 
+// we overload wxEntry[Start]() to take "char **" pointers too
+#if wxUSE_UNICODE
+
+extern bool WXDLLIMPEXP_BASE wxEntryStart(int& argc, char **argv);
+extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);
+
+#endif// wxUSE_UNICODE
 
 // ----------------------------------------------------------------------------
 // Using the library without (explicit) application object: you may avoid using
@@ -65,7 +73,10 @@ class WXDLLIMPEXP_BASE wxInitializer
 {
 public:
     // initialize the library
-    wxInitializer() { m_ok = wxInitialize(); }
+    wxInitializer(int argc = 0, wxChar **argv = NULL)
+    {
+        m_ok = wxInitialize(argc, argv);
+    }
 
     // has the initialization been successful? (explicit test)
     bool IsOk() const { return m_ok; }