fix for wxBase compilation (misplaced #if wxUSE_GUI)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10997 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-13 13:51:57 +00:00
parent 831b3152e8
commit 8ca28fb797

View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: log.h
// Name: wx/log.h
// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs)
// Author: Vadim Zeitlin
// Modified by:
@ -264,30 +264,6 @@ protected:
#endif // wxUSE_STD_IOSTREAM
// the following log targets are only compiled in if the we're compiling the
// GUI part (andnot just the base one) of the library, they're implemented in
// src/generic/logg.cpp *and not src/common/log.cpp unlike all the rest)
#if wxUSE_GUI
#if wxUSE_TEXTCTRL
// log everything to a text window (GUI only of course)
class WXDLLEXPORT wxLogTextCtrl : public wxLog
{
public:
wxLogTextCtrl(wxTextCtrl *pTextCtrl);
private:
// implement sink function
virtual void DoLogString(const wxChar *szString, time_t t);
// the control we use
wxTextCtrl *m_pTextCtrl;
};
#endif // wxUSE_TEXTCTRL
// ----------------------------------------------------------------------------
// /dev/null log target: suppress logging until this object goes out of scope
// ----------------------------------------------------------------------------
@ -371,6 +347,32 @@ public:
wxLogPassThrough();
};
// ----------------------------------------------------------------------------
// the following log targets are only compiled in if the we're compiling the
// GUI part (andnot just the base one) of the library, they're implemented in
// src/generic/logg.cpp *and not src/common/log.cpp unlike all the rest)
// ----------------------------------------------------------------------------
#if wxUSE_GUI
#if wxUSE_TEXTCTRL
// log everything to a text window (GUI only of course)
class WXDLLEXPORT wxLogTextCtrl : public wxLog
{
public:
wxLogTextCtrl(wxTextCtrl *pTextCtrl);
private:
// implement sink function
virtual void DoLogString(const wxChar *szString, time_t t);
// the control we use
wxTextCtrl *m_pTextCtrl;
};
#endif // wxUSE_TEXTCTRL
// ----------------------------------------------------------------------------
// GUI log target, the default one for wxWindows programs
// ----------------------------------------------------------------------------