get rid of __WXCOCOA__ check in common CreateLogTarget(), the right way to do this is to override wxUSE_LOG_DIALOG option in wxCocoa-specific chkconf.h
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55546 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
13c7fb28ff
commit
d30ef76952
@ -1022,6 +1022,8 @@
|
|||||||
# include "wx/msw/chkconf.h"
|
# include "wx/msw/chkconf.h"
|
||||||
#elif defined(__WXGTK__)
|
#elif defined(__WXGTK__)
|
||||||
# include "wx/gtk/chkconf.h"
|
# include "wx/gtk/chkconf.h"
|
||||||
|
#elif defined(__WXCOCOA__)
|
||||||
|
# include "wx/cocoa/chkconf.h"
|
||||||
#elif defined(__WXMAC__)
|
#elif defined(__WXMAC__)
|
||||||
# include "wx/osx/chkconf.h"
|
# include "wx/osx/chkconf.h"
|
||||||
#elif defined(__OS2__)
|
#elif defined(__OS2__)
|
||||||
|
22
include/wx/cocoa/chkconf.h
Normal file
22
include/wx/cocoa/chkconf.h
Normal file
@ -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_
|
@ -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
|
#if wxUSE_LOGGUI
|
||||||
// just doesn't work right at all on wxCocoa.
|
|
||||||
#if wxUSE_LOGGUI && !defined(__WXCOCOA__)
|
|
||||||
return new wxLogGui;
|
return new wxLogGui;
|
||||||
#else
|
#else
|
||||||
// we must have something!
|
// we must have something!
|
||||||
|
Loading…
Reference in New Issue
Block a user