Rebake from clean wx tree.

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

diff --git a/include/wx/init.h b/include/wx/init.h
index ad8e96da2ccde0e83f352750b5b6e0b99f0f0d22..3ea8957cc39ae01da40b3bc1ddced77ac5fbf224 100644 (file)
--- 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())
 
 // 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
 #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
 #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
 {
 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
     {
         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);
     }
     {
         m_ok = wxInitialize(argc, argv);
     }