compilation fix for wxUSE_LOG == 0 (part of patch 843206)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -18,25 +18,11 @@
|
|||||||
|
|
||||||
#include "wx/defs.h"
|
#include "wx/defs.h"
|
||||||
|
|
||||||
#if wxUSE_LOG
|
|
||||||
|
|
||||||
#include "wx/string.h"
|
|
||||||
#include "wx/arrstr.h"
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
// forward declarations
|
|
||||||
// ----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
#if wxUSE_GUI
|
|
||||||
class WXDLLIMPEXP_CORE wxTextCtrl;
|
|
||||||
class WXDLLIMPEXP_CORE wxLogFrame;
|
|
||||||
class WXDLLIMPEXP_CORE wxFrame;
|
|
||||||
#endif // wxUSE_GUI
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// types
|
// types
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// NB: these types are needed even if wxUSE_LOG == 0
|
||||||
typedef unsigned long wxTraceMask;
|
typedef unsigned long wxTraceMask;
|
||||||
typedef unsigned long wxLogLevel;
|
typedef unsigned long wxLogLevel;
|
||||||
|
|
||||||
@@ -44,8 +30,13 @@ typedef unsigned long wxLogLevel;
|
|||||||
// headers
|
// headers
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_LOG
|
||||||
|
|
||||||
|
#include "wx/string.h"
|
||||||
|
#include "wx/arrstr.h"
|
||||||
|
|
||||||
#ifndef __WXWINCE__
|
#ifndef __WXWINCE__
|
||||||
#include <time.h> // for time_t
|
#include <time.h> // for time_t
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/dynarray.h"
|
#include "wx/dynarray.h"
|
||||||
@@ -58,6 +49,16 @@ typedef unsigned long wxLogLevel;
|
|||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
// forward declarations
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#if wxUSE_GUI
|
||||||
|
class WXDLLIMPEXP_CORE wxTextCtrl;
|
||||||
|
class WXDLLIMPEXP_CORE wxLogFrame;
|
||||||
|
class WXDLLIMPEXP_CORE wxFrame;
|
||||||
|
#endif // wxUSE_GUI
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// constants
|
// constants
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user