set m_encoding in wxCSConv ctor from name

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

diff --git a/include/wx/log.h b/include/wx/log.h
index f61b6de4ec1a91914abdbcf2264abdfcf35eedc1..29c3464b30de6c2f2e5fd10bc93f775d7b4d736f 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -12,10 +12,6 @@
 #ifndef _WX_LOG_H_
 #define _WX_LOG_H_
 
 #ifndef _WX_LOG_H_
 #define _WX_LOG_H_
 

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

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


@@ -288,8 +284,6 @@ private:
 // "trivial" derivations of wxLog
 // ----------------------------------------------------------------------------
 
 // "trivial" derivations of wxLog
 // ----------------------------------------------------------------------------
 

-#if wxABI_VERSION > 20601
-

 // log everything to a buffer
 class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog
 {
 // log everything to a buffer
 class WXDLLIMPEXP_BASE wxLogBuffer : public wxLog
 {


@@ -313,7 +307,6 @@ private:
     DECLARE_NO_COPY_CLASS(wxLogBuffer)
 };
 
     DECLARE_NO_COPY_CLASS(wxLogBuffer)
 };
 

-#endif // wxABI_VERSION

 
 // log everything to a "FILE *", stderr by default
 class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
 
 // log everything to a "FILE *", stderr by default
 class WXDLLIMPEXP_BASE wxLogStderr : public wxLog