From d368860323bf1f7e03e8ece4e8ce75f88d5ef7dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 31 Jul 2009 18:48:34 +0000
Subject: [PATCH] compilation fix: only one wxInitialize form may have default
 argument values. It doesn't make sense to specify only argc>0, so removed
 default values and added default wxInitializer ctor.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/init.h   | 14 ++++++++++----
 src/common/init.cpp |  5 +++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/include/wx/init.h b/include/wx/init.h
index ad8e96da2c..3ea8957cc3 100644
--- a/include/wx/init.h
+++ b/include/wx/init.h
@@ -61,9 +61,10 @@ 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);
+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);
     }
diff --git a/src/common/init.cpp b/src/common/init.cpp
index 7e8159872d..cf36649317 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -465,6 +465,11 @@ int wxEntry(int& argc, char **argv)
 // wxInitialize/wxUninitialize
 // ----------------------------------------------------------------------------
 
+bool wxInitialize()
+{
+    return wxInitialize(0, (wxChar**)NULL);
+}
+
 bool wxInitialize(int argc, wxChar **argv)
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
-- 
2.45.2