From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 10 Feb 2004 21:16:58 +0000 (+0000)
Subject: compilation fix for wxUSE_LOG == 0 (part of patch 843206)
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1782be316936377e4efa0c3525542dd566de368b

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
---

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 <time.h>   // for time_t
+    #include <time.h>   // 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
 // ----------------------------------------------------------------------------