split wxBase into wxBase and wxNet libraries

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 5d97fe53e2fe0ce09b95b15d00c65154471960d1..a2f304a9073d3268c0a83561272e830677d83683 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -9,23 +9,29 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef   _WX_LOG_H_
-#define   _WX_LOG_H_
+#ifndef _WX_LOG_H_
+#define _WX_LOG_H_

 
 #if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "log.h"
 #endif
 
 
 #if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "log.h"
 #endif
 

-#include "wx/setup.h"
+#include "wx/defs.h"
+
+#if wxUSE_LOG
+

 #include "wx/string.h"
 #include "wx/string.h"

+#include "wx/arrstr.h"

 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxTextCtrl;
-class WXDLLEXPORT wxLogFrame;
-class WXDLLEXPORT wxFrame;
+#if wxUSE_GUI
+    class WXDLLIMPEXP_CORE wxTextCtrl;
+    class WXDLLIMPEXP_CORE wxLogFrame;
+    class WXDLLIMPEXP_CORE wxFrame;
+#endif // wxUSE_GUI

 
 // ----------------------------------------------------------------------------
 // types
 
 // ----------------------------------------------------------------------------
 // types


@@ -38,8 +44,6 @@ typedef unsigned long wxLogLevel;
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if wxUSE_LOG
-

 #ifndef __WXWINCE__
 #include <time.h>   // for time_t
 #endif
 #ifndef __WXWINCE__
 #include <time.h>   // for time_t
 #endif


@@ -108,7 +112,7 @@ enum
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------
 
 // normally, only a single instance of this class exists but it's not enforced
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxLog
+class WXDLLIMPEXP_BASE wxLog

 {
 public:
     // ctor
 {
 public:
     // ctor


@@ -184,7 +188,8 @@ public:
         // trace mask (see wxTraceXXX constants for details)
     static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
         // add string trace mask
         // trace mask (see wxTraceXXX constants for details)
     static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
         // add string trace mask

-    static void AddTraceMask(const wxString& str) { ms_aTraceMasks.Add(str); }
+    static void AddTraceMask(const wxString& str)
+        { ms_aTraceMasks.push_back(str); }

         // add string trace mask
     static void RemoveTraceMask(const wxString& str);
         // remove all string trace masks
         // add string trace mask
     static void RemoveTraceMask(const wxString& str);
         // remove all string trace masks


@@ -204,8 +209,7 @@ public:
         // get trace mask
     static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
         // is this trace mask in the list?
         // get trace mask
     static wxTraceMask GetTraceMask() { return ms_ulTraceMask; }
         // is this trace mask in the list?

-    static bool IsAllowedTraceMask(const wxChar *mask)
-        { return ms_aTraceMasks.Index(mask) != wxNOT_FOUND; }
+    static bool IsAllowedTraceMask(const wxChar *mask);

         // return the current loglevel limit
     static wxLogLevel GetLogLevel() { return ms_logLevel; }
 
         // return the current loglevel limit
     static wxLogLevel GetLogLevel() { return ms_logLevel; }
 


@@ -260,7 +264,7 @@ private:
 // ----------------------------------------------------------------------------
 
 // log everything to a "FILE *", stderr by default
 // ----------------------------------------------------------------------------
 
 // log everything to a "FILE *", stderr by default

-class WXDLLEXPORT wxLogStderr : public wxLog
+class WXDLLIMPEXP_BASE wxLogStderr : public wxLog

 {
     DECLARE_NO_COPY_CLASS(wxLogStderr)
 
 {
     DECLARE_NO_COPY_CLASS(wxLogStderr)
 


@@ -278,7 +282,7 @@ protected:
 #if wxUSE_STD_IOSTREAM
 
 // log everything to an "ostream", cerr by default
 #if wxUSE_STD_IOSTREAM
 
 // log everything to an "ostream", cerr by default

-class WXDLLEXPORT wxLogStream : public wxLog
+class WXDLLIMPEXP_BASE wxLogStream : public wxLog

 {
 public:
     // redirect log output to an ostream
 {
 public:
     // redirect log output to an ostream


@@ -314,7 +318,7 @@ protected:
         // ~wxLogNull called, old log sink restored
     }
  */
         // ~wxLogNull called, old log sink restored
     }
  */

-class WXDLLEXPORT wxLogNull
+class WXDLLIMPEXP_BASE wxLogNull

 {
 public:
     wxLogNull() : m_flagOld(wxLog::EnableLogging(FALSE)) { }
 {
 public:
     wxLogNull() : m_flagOld(wxLog::EnableLogging(FALSE)) { }


@@ -333,7 +337,7 @@ private:
 // does it itself in its ctor
 // ----------------------------------------------------------------------------
 
 // does it itself in its ctor
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxLogChain : public wxLog
+class WXDLLIMPEXP_BASE wxLogChain : public wxLog

 {
 public:
     wxLogChain(wxLog *logger);
 {
 public:
     wxLogChain(wxLog *logger);


@@ -373,10 +377,13 @@ private:
 };
 
 // a chain log target which uses itself as the new logger
 };
 
 // a chain log target which uses itself as the new logger

-class WXDLLEXPORT wxLogPassThrough : public wxLogChain
+class WXDLLIMPEXP_BASE wxLogPassThrough : public wxLogChain

 {
 public:
     wxLogPassThrough();
 {
 public:
     wxLogPassThrough();

+
+private:
+    DECLARE_NO_COPY_CLASS(wxLogPassThrough)

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


@@ -398,43 +405,45 @@ public:
 // ----------------------------------------------------------------------------
 
 // return the last system error code
 // ----------------------------------------------------------------------------
 
 // return the last system error code

-WXDLLEXPORT unsigned long wxSysErrorCode();
+WXDLLIMPEXP_BASE unsigned long wxSysErrorCode();

 
 // return the error message for given (or last if 0) error code
 
 // return the error message for given (or last if 0) error code

-WXDLLEXPORT const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
+WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);

 
 // ----------------------------------------------------------------------------
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 

-#define DECLARE_LOG_FUNCTION(level)                                 \
-extern void WXDLLEXPORT wxVLog##level(const wxChar *szFormat,       \
-                                      va_list argptr);              \
-extern void WXDLLEXPORT wxLog##level(const wxChar *szFormat,        \
+#define DECLARE_LOG_FUNCTION(level)                                         \
+extern void WXDLLIMPEXP_BASE wxVLog##level(const wxChar *szFormat,          \
+                                      va_list argptr);                      \
+extern void WXDLLIMPEXP_BASE wxLog##level(const wxChar *szFormat,           \

                                      ...) ATTRIBUTE_PRINTF_1
                                      ...) ATTRIBUTE_PRINTF_1

-#define DECLARE_LOG_FUNCTION2(level, arg1)                          \
-extern void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \
-                                      va_list argptr);              \
-extern void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat,  \
+#define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl)                      \
+extern void expdecl wxVLog##level(arg, const wxChar *szFormat,              \
+                                      va_list argptr);                      \
+extern void expdecl wxLog##level(arg, const wxChar *szFormat,               \

                                      ...) ATTRIBUTE_PRINTF_2
                                      ...) ATTRIBUTE_PRINTF_2

+#define DECLARE_LOG_FUNCTION2(level, arg)                                   \
+    DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE)

 
 #else // !wxUSE_LOG
 
 // log functions do nothing at all
 
 #else // !wxUSE_LOG
 
 // log functions do nothing at all

-#define DECLARE_LOG_FUNCTION(level)                                 \
-inline void WXDLLEXPORT wxVLog##level(const wxChar *szFormat,       \
-                                     va_list argptr) {}             \
-inline void WXDLLEXPORT wxLog##level(const wxChar *szFormat, ...) {}
-#define DECLARE_LOG_FUNCTION2(level, arg1)                          \
-inline void WXDLLEXPORT wxVLog##level(arg1, const wxChar *szFormat, \
-                                     va_list argptr) {}             \
-inline void WXDLLEXPORT wxLog##level(arg1, const wxChar *szFormat, ...) {}
+#define DECLARE_LOG_FUNCTION(level)                                         \
+inline void wxVLog##level(const wxChar *szFormat,                           \
+                                     va_list argptr) { }                    \
+inline void wxLog##level(const wxChar *szFormat, ...) { }
+#define DECLARE_LOG_FUNCTION2(level, arg)                                   \
+inline void wxVLog##level(arg, const wxChar *szFormat,                      \
+                                     va_list argptr) {}                     \
+inline void wxLog##level(arg, const wxChar *szFormat, ...) { }

 
 // Empty Class to fake wxLogNull
 
 // Empty Class to fake wxLogNull

-class WXDLLEXPORT wxLogNull
+class WXDLLIMPEXP_BASE wxLogNull

 {
 public:
 {
 public:

-    wxLogNull() {}
+    wxLogNull() { }

 };
 
 // Dummy macros to replace some functions.
 };
 
 // Dummy macros to replace some functions.


@@ -442,7 +451,7 @@ public:
 #define wxSysErrorMsg( X ) (const wxChar*)NULL
 
 // Fake symbolic trace masks... for those that are used frequently
 #define wxSysErrorMsg( X ) (const wxChar*)NULL
 
 // Fake symbolic trace masks... for those that are used frequently

-#define wxTRACE_OleCalls wxT("") // OLE interface calls
+#define wxTRACE_OleCalls wxEmptyString // OLE interface calls

 
 #endif // wxUSE_LOG/!wxUSE_LOG
 
 
 #endif // wxUSE_LOG/!wxUSE_LOG
 


@@ -461,9 +470,11 @@ DECLARE_LOG_FUNCTION(Verbose);
 // application frame, if any
 DECLARE_LOG_FUNCTION(Status);
 
 // application frame, if any
 DECLARE_LOG_FUNCTION(Status);
 

-// this one is the same as previous except that it allows to explicitly
-// specify the frame to which the output should go
-DECLARE_LOG_FUNCTION2(Status, wxFrame *pFrame);
+#if wxUSE_GUI
+    // this one is the same as previous except that it allows to explicitly
+    // specify the frame to which the output should go
+    DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *pFrame, WXDLLIMPEXP_CORE);
+#endif // wxUSE_GUI

 
 // additional one: as wxLogError, but also logs last system call error code
 // and the corresponding error message if available
 
 // additional one: as wxLogError, but also logs last system call error code
 // and the corresponding error message if available


@@ -502,7 +513,8 @@ DECLARE_LOG_FUNCTION2(SysError, long lErrCode);
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash
 
 // wxLogFatalError helper: show the (fatal) error to the user in a safe way,
 // i.e. without using wxMessageBox() for example because it could crash

-void WXDLLEXPORT wxSafeShowMessage(const wxString& title, const wxString& text);
+void WXDLLIMPEXP_BASE
+wxSafeShowMessage(const wxString& title, const wxString& text);

 
 // ----------------------------------------------------------------------------
 // debug only logging functions: use them with API name and error code
 
 // ----------------------------------------------------------------------------
 // debug only logging functions: use them with API name and error code