get rid of __WXCOCOA__ check in common CreateLogTarget(), the right way to do this...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 36095513db17d5cd3df48ef1384e32fc6813f5e5..5ba0f6c5d2a15f46456de20d094305fc957e7ebb 100644 (file)
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -1022,6 +1022,8 @@
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"
 #  include "wx/msw/chkconf.h"
 #elif defined(__WXGTK__)
 #  include "wx/gtk/chkconf.h"

+#elif defined(__WXCOCOA__)
+#  include "wx/cocoa/chkconf.h"

 #elif defined(__WXMAC__)
 #  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)
 #elif defined(__WXMAC__)
 #  include "wx/osx/chkconf.h"
 #elif defined(__OS2__)

diff --git a/include/wx/cocoa/chkconf.h b/include/wx/cocoa/chkconf.h
new file mode 100644 (file)
index 0000000..738df17
--- /dev/null
+++ b/include/wx/cocoa/chkconf.h
@@ -0,0 +1,22 @@
+/*
+ * Name:        wx/cocoa/chkconf.h
+ * Purpose:     wxCocoa-specific config settings checks
+ * Author:      Vadim Zeitlin
+ * Created:     2008-09-11
+ * RCS-ID:      $Id$
+ * Copyright:   (c) 2008 Vadim Zeitlin <vadim@wxwidgets.org>
+ * Licence:     wxWindows licence
+ */
+
+/* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
+
+#ifndef _WX_COCOA_CHKCONF_H_
+#define _WX_COCOA_CHKCONF_H_
+
+/*
+    wxLogDialog doesn't currently work correctly in wxCocoa.
+ */
+#undef wxUSE_LOG_DIALOG
+#define wxUSE_LOG_DIALOG 0
+
+#endif // _WX_COCOA_CHKCONF_H_

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 2df9a21aaf44c7220ea72f34ea532e681b965e2e..41f3958d4772c25a6763f76f4000d0f477e46307 100644 (file)
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -419,9 +419,7 @@ bool wxAppBase::SendIdleEvents(wxWindow* win, wxIdleEvent& event)
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {
 
 wxLog *wxGUIAppTraitsBase::CreateLogTarget()
 {

-// 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__)
+#if wxUSE_LOGGUI

     return new wxLogGui;
 #else
     // we must have something!
     return new wxLogGui;
 #else
     // we must have something!