added wxInitialize() overload taking char**, to make use from main() easier

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/init.h b/include/wx/init.h
index 5a66f42168d103d143f3e48acb4d3207b3fc9005..ad8e96da2ccde0e83f352750b5b6e0b99f0f0d22 100644 (file)
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -62,6 +62,9 @@ extern int WXDLLIMPEXP_BASE wxEntry(int& argc, char **argv);
 // 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);
+#if wxUSE_UNICODE
+extern bool WXDLLIMPEXP_BASE wxInitialize(int argc = 0, char **argv = NULL);
+#endif
 
 // clean up -- the library can't be used any more after the last call to
 // wxUninitialize()
@@ -78,6 +81,13 @@ public:
         m_ok = wxInitialize(argc, argv);
     }
 
+#if wxUSE_UNICODE
+    wxInitializer(int argc = 0, char **argv = NULL)
+    {
+        m_ok = wxInitialize(argc, argv);
+    }
+#endif // wxUSE_UNICODE
+
     // has the initialization been successful? (explicit test)
     bool IsOk() const { return m_ok; }
 

diff --git a/src/common/init.cpp b/src/common/init.cpp
index dd91413436e2f504b2a11817edacee4a6a21c7cb..7e8159872d2b1cbcb019f4d1257db57120f37f21 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -478,6 +478,21 @@ bool wxInitialize(int argc, wxChar **argv)
     return wxEntryStart(argc, argv);
 }
 
+#if wxUSE_UNICODE
+bool wxInitialize(int argc, char **argv)
+{
+    wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
+
+    if ( gs_initData.nInitCount++ )
+    {
+        // already initialized
+        return true;
+    }
+
+    return wxEntryStart(argc, argv);
+}
+#endif // wxUSE_UNICODE
+
 void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);