Metrowerks Objective-C++ is more strict about types than Apple's.

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

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 8e4cba57e0021dbc48e84fa7651bc9c6cdbbd478..a225bf6833c6e561294921cf0e3e65afbf6b1659 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -369,13 +369,19 @@ void wxEntryCleanup()
 // wxEntry
 // ----------------------------------------------------------------------------
 
 // wxEntry
 // ----------------------------------------------------------------------------
 

-// for MSW with wxUSE_ON_FATAL_EXCEPTION on, wxEntry is defined in msw/main.cpp
-#if !defined(__WXMSW__) || !wxUSE_ON_FATAL_EXCEPTION
+// for MSW the real wxEntry is defined in msw/main.cpp
+#ifndef __WXMSW__

     #define wxEntryReal wxEntry
     #define wxEntryReal wxEntry

-#endif // !(__WXMSW__ && wxUSE_ON_FATAL_EXCEPTION)
+#endif // !__WXMSW__

 
 int wxEntryReal(int& argc, wxChar **argv)
 {
 
 int wxEntryReal(int& argc, wxChar **argv)
 {

+#if wxUSE_LOG
+    // Create a non-GUI log target, to be used until GUI (if any) is ready.
+    // Target will be reset by wxAppConsole::Initialize, when GUI logging will work.
+    wxLog::GetActiveTarget();
+#endif
+

     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {
     // library initialization
     if ( !wxEntryStart(argc, argv) )
     {