we probably don't need crit section in GetTimeZone()

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 14d60569292511b2f65d035f2bf02436e8855408..c25c12cd866653d23ffe38d4378390e24f76515a 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -111,6 +111,15 @@ public:
     ~wxCleanupOnExit() { wxEntryCleanup(); }
 };
 
     ~wxCleanupOnExit() { wxEntryCleanup(); }
 };
 

+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+// suppress warnings about unused variables
+static inline void Use(void *) { }
+
+#define WX_SUPPRESS_UNUSED_WARN(x) Use(&x)
+

 // ----------------------------------------------------------------------------
 // initialization data
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // initialization data
 // ----------------------------------------------------------------------------


@@ -380,8 +389,10 @@ int wxEntryReal(int& argc, wxChar **argv)
     // below returns or throws
     wxCleanupOnExit cleanupOnExit;
 
     // below returns or throws
     wxCleanupOnExit cleanupOnExit;
 

+    WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
+

     // app initialization
     // app initialization

-    if ( !wxTheApp->OnInit() )
+    if ( !wxTheApp->CallOnInit() )

     {
         // don't call OnExit() if OnInit() failed
         return -1;
     {
         // don't call OnExit() if OnInit() failed
         return -1;


@@ -427,8 +438,11 @@ int wxEntry(int& argc, wxChar **argv)
     {
         ::ExitProcess(3); // the same exit code as abort()
 
     {
         ::ExitProcess(3); // the same exit code as abort()
 

+#if !defined(_MSC_VER) || _MSC_VER < 1300

         // this code is unreachable but put it here to suppress warnings
         // this code is unreachable but put it here to suppress warnings

+        // from some compilers

         return -1;
         return -1;

+#endif

     }
 }
 
     }
 }