Don't define wxArrayPGProperty as std::vector in STL build.

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 90afc70ac85f630041fca490e08035857f2e9ebf..cf366493175356e81748c95cdbbcc97ccb2dac8f 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -113,14 +113,6 @@ private:
     wxAppConsole *m_app;
 };
 
     wxAppConsole *m_app;
 };
 

-// another tiny class which simply exists to ensure that wxEntryCleanup is
-// always called
-class wxCleanupOnExit
-{
-public:
-    ~wxCleanupOnExit() { wxEntryCleanup(); }
-};
-

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------


@@ -422,7 +414,9 @@ void wxEntryCleanup()
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization
 int wxEntryReal(int& argc, wxChar **argv)
 {
     // library initialization

-    if ( !wxEntryStart(argc, argv) )
+    wxInitializer initializer(argc, argv);
+
+    if ( !initializer.IsOk() )

     {
 #if wxUSE_LOG
         // flush any log messages explaining why we failed
     {
 #if wxUSE_LOG
         // flush any log messages explaining why we failed


@@ -431,12 +425,6 @@ int wxEntryReal(int& argc, wxChar **argv)
         return -1;
     }
 
         return -1;
     }
 

-    // if wxEntryStart succeeded, we must call wxEntryCleanup even if the code
-    // below returns or throws
-    wxCleanupOnExit cleanupOnExit;
-
-    WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
-

     wxTRY
     {
         // app initialization
     wxTRY
     {
         // app initialization


@@ -477,6 +465,11 @@ int wxEntry(int& argc, char **argv)
 // wxInitialize/wxUninitialize
 // ----------------------------------------------------------------------------
 
 // wxInitialize/wxUninitialize
 // ----------------------------------------------------------------------------
 

+bool wxInitialize()
+{
+    return wxInitialize(0, (wxChar**)NULL);
+}
+

 bool wxInitialize(int argc, wxChar **argv)
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);
 bool wxInitialize(int argc, wxChar **argv)
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);


@@ -490,6 +483,21 @@ bool wxInitialize(int argc, wxChar **argv)
     return wxEntryStart(argc, 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);
 void wxUninitialize()
 {
     wxCRIT_SECT_LOCKER(lockInit, gs_initData.csInit);