Open Watcom doesn't like typename, use class (patch 826812)

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 256a38ead8042a5849c3552a93936bdac0126c77..a2670f451d9f80f17b1a62fe35333b8614fa2887 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -12,22 +12,25 @@
 #ifndef _WX_LOG_H_
 #define _WX_LOG_H_
 
 #ifndef _WX_LOG_H_
 #define _WX_LOG_H_
 

-#if defined(__GNUG__) && !defined(__APPLE__)
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma interface "log.h"
 #endif
 
     #pragma interface "log.h"
 #endif
 

-#include "wx/string.h"
+#include "wx/defs.h"

 
 #if wxUSE_LOG
 
 
 #if wxUSE_LOG
 

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

 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 #if wxUSE_GUI
 // ----------------------------------------------------------------------------
 // forward declarations
 // ----------------------------------------------------------------------------
 
 #if wxUSE_GUI

-    class WXDLLEXPORT_CORE wxTextCtrl;
-    class WXDLLEXPORT_CORE wxLogFrame;
-    class WXDLLEXPORT_CORE wxFrame;
+    class WXDLLIMPEXP_CORE wxTextCtrl;
+    class WXDLLIMPEXP_CORE wxLogFrame;
+    class WXDLLIMPEXP_CORE wxFrame;

 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_GUI
 
 // ----------------------------------------------------------------------------


@@ -109,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_BASE wxLog
+class WXDLLIMPEXP_BASE wxLog

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


@@ -185,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


@@ -205,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; }
 


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

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

 {
     DECLARE_NO_COPY_CLASS(wxLogStderr)
 
 {
     DECLARE_NO_COPY_CLASS(wxLogStderr)
 


@@ -279,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_BASE wxLogStream : public wxLog
+class WXDLLIMPEXP_BASE wxLogStream : public wxLog

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


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

-class WXDLLEXPORT_BASE wxLogNull
+class WXDLLIMPEXP_BASE wxLogNull

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


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

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

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


@@ -374,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_BASE 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


@@ -399,19 +405,19 @@ public:
 // ----------------------------------------------------------------------------
 
 // return the last system error code
 // ----------------------------------------------------------------------------
 
 // return the last system error code

-WXDLLEXPORT_BASE 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_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);
+WXDLLIMPEXP_BASE const wxChar* wxSysErrorMsg(unsigned long nErrCode = 0);

 
 // ----------------------------------------------------------------------------
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 
 #define DECLARE_LOG_FUNCTION(level)                                         \
 
 // ----------------------------------------------------------------------------
 // define wxLog<level>
 // ----------------------------------------------------------------------------
 
 #define DECLARE_LOG_FUNCTION(level)                                         \

-extern void WXDLLEXPORT_BASE wxVLog##level(const wxChar *szFormat,          \
+extern void WXDLLIMPEXP_BASE wxVLog##level(const wxChar *szFormat,          \

                                       va_list argptr);                      \
                                       va_list argptr);                      \

-extern void WXDLLEXPORT_BASE wxLog##level(const wxChar *szFormat,           \
+extern void WXDLLIMPEXP_BASE wxLog##level(const wxChar *szFormat,           \

                                      ...) ATTRIBUTE_PRINTF_1
 #define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl)                      \
 extern void expdecl wxVLog##level(arg, const wxChar *szFormat,              \
                                      ...) ATTRIBUTE_PRINTF_1
 #define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl)                      \
 extern void expdecl wxVLog##level(arg, const wxChar *szFormat,              \


@@ -419,7 +425,7 @@ extern void expdecl wxVLog##level(arg, const wxChar *szFormat,              \
 extern void expdecl wxLog##level(arg, const wxChar *szFormat,               \
                                      ...) ATTRIBUTE_PRINTF_2
 #define DECLARE_LOG_FUNCTION2(level, arg)                                   \
 extern void expdecl wxLog##level(arg, const wxChar *szFormat,               \
                                      ...) ATTRIBUTE_PRINTF_2
 #define DECLARE_LOG_FUNCTION2(level, arg)                                   \

-    DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLEXPORT_BASE)
+    DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE)

 
 #else // !wxUSE_LOG
 
 
 #else // !wxUSE_LOG
 


@@ -434,7 +440,7 @@ inline void wxVLog##level(arg, const wxChar *szFormat,                      \
 inline void wxLog##level(arg, const wxChar *szFormat, ...) { }
 
 // Empty Class to fake wxLogNull
 inline void wxLog##level(arg, const wxChar *szFormat, ...) { }
 
 // Empty Class to fake wxLogNull

-class WXDLLEXPORT_BASE wxLogNull
+class WXDLLIMPEXP_BASE wxLogNull

 {
 public:
     wxLogNull() { }
 {
 public:
     wxLogNull() { }


@@ -445,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
 


@@ -467,7 +473,7 @@ DECLARE_LOG_FUNCTION(Status);
 #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
 #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, WXDLLEXPORT_CORE);
+    DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *pFrame, WXDLLIMPEXP_CORE);

 #endif // wxUSE_GUI
 
 // additional one: as wxLogError, but also logs last system call error code
 #endif // wxUSE_GUI
 
 // additional one: as wxLogError, but also logs last system call error code


@@ -507,7 +513,7 @@ 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_BASE
+void WXDLLIMPEXP_BASE

 wxSafeShowMessage(const wxString& title, const wxString& text);
 
 // ----------------------------------------------------------------------------
 wxSafeShowMessage(const wxString& title, const wxString& text);
 
 // ----------------------------------------------------------------------------


@@ -524,8 +530,8 @@ wxSafeShowMessage(const wxString& title, const wxString& text);
                    (long)rc, wxSysErrorMsg(rc))
 #else // !VC++
     #define wxLogApiError(api, rc)                                            \
                    (long)rc, wxSysErrorMsg(rc))
 #else // !VC++
     #define wxLogApiError(api, rc)                                            \

-        wxLogDebug(wxT("In file %s at line %d: '%s' failed with "             \
-                       "error 0x%08lx (%s)."),                                \
+        wxLogDebug(wxT("In file %s at line %d: '%s' failed with ")            \
+                   wxT("error 0x%08lx (%s)."),                                \

                    __TFILE__, __LINE__, api,                                  \
                    (long)rc, wxSysErrorMsg(rc))
 #endif // VC++/!VC++
                    __TFILE__, __LINE__, api,                                  \
                    (long)rc, wxSysErrorMsg(rc))
 #endif // VC++/!VC++