X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a619fa3f907c0e43fe854212f466bda63fceaa27..46d492a879f7fec474c0847dd0637593453746eb:/include/wx/log.h diff --git a/include/wx/log.h b/include/wx/log.h index 102e962521..4f68880dd3 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -18,25 +18,11 @@ #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 // ---------------------------------------------------------------------------- +// NB: these types are needed even if wxUSE_LOG == 0 typedef unsigned long wxTraceMask; typedef unsigned long wxLogLevel; @@ -44,8 +30,13 @@ typedef unsigned long wxLogLevel; // headers // ---------------------------------------------------------------------------- +#if wxUSE_LOG + +#include "wx/string.h" +#include "wx/arrstr.h" + #ifndef __WXWINCE__ -#include // for time_t + #include // for time_t #endif #include "wx/dynarray.h" @@ -58,6 +49,16 @@ typedef unsigned long wxLogLevel; # endif #endif +// ---------------------------------------------------------------------------- +// forward declarations +// ---------------------------------------------------------------------------- + +#if wxUSE_GUI + class WXDLLIMPEXP_CORE wxTextCtrl; + class WXDLLIMPEXP_CORE wxLogFrame; + class WXDLLIMPEXP_CORE wxFrame; +#endif // wxUSE_GUI + // ---------------------------------------------------------------------------- // constants // ----------------------------------------------------------------------------