avoid a bug in Carbon headers

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

diff --git a/include/wx/log.h b/include/wx/log.h
index 472d6776a88fb7a27bd027ba976e5008020908ae..758c44e6e83ed355c05ad4499a736b9bdf853f93 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -12,7 +12,7 @@
 #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
 


@@ -381,6 +381,9 @@ class WXDLLIMPEXP_BASE wxLogPassThrough : public wxLogChain
 {
 public:
     wxLogPassThrough();
 {
 public:
     wxLogPassThrough();

+
+private:
+    DECLARE_NO_COPY_CLASS(wxLogPassThrough)

 };
 
 #if wxUSE_GUI
 };
 
 #if wxUSE_GUI


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