X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0728199b911be9095406cf05059a5a180e707778..5f77ee3b876731d20f5b73678c414ec5b3892a1b:/src/common/appcmn.cpp?ds=sidebyside

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 8a33c3f31f..421fff4699 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -203,7 +203,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
 #ifdef __WXUNIVERSAL__
         {
             wxCMD_LINE_OPTION,
-            wxEmptyString,
+            "",
             OPTION_THEME,
             gettext_noop("specify the theme to use"),
             wxCMD_LINE_VAL_STRING,
@@ -217,7 +217,7 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         //     and not mgl/app.cpp
         {
             wxCMD_LINE_OPTION,
-            wxEmptyString,
+            "",
             OPTION_MODE,
             gettext_noop("specify display mode to use (e.g. 640x480-16)"),
             wxCMD_LINE_VAL_STRING,
@@ -228,9 +228,9 @@ void wxAppBase::OnInitCmdLine(wxCmdLineParser& parser)
         // terminator
         {
             wxCMD_LINE_NONE,
-            wxEmptyString,
-            wxEmptyString,
-            wxEmptyString,
+            "",
+            "",
+            "",
             wxCMD_LINE_VAL_NONE,
             0x0
         }
@@ -433,7 +433,9 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
-#if wxUSE_LOGGUI
+// DE: One day I'll remove this but right now the generic dialog used for this
+// just doesn't work right at all on wxCocoa.
+#if wxUSE_LOGGUI && !defined(__WXCOCOA__)
     return new wxLogGui;
 #else
     // we must have something!
@@ -456,8 +458,10 @@ wxMessageOutput *wxGUIAppTraitsBase::CreateMessageOutput()
     // wxMessageOutputMessageBox doesn't work under Motif
     #ifdef __WXMOTIF__
         return new wxMessageOutputLog;
-    #else
+    #elif wxUSE_MSGDLG
         return new wxMessageOutputMessageBox;
+    #else
+        return new wxMessageOutputStderr;
     #endif
 #endif // __UNIX__/!__UNIX__
 }