Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

partially applied patch #895170: "Building with minimal setup.h - continuation"

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27513 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Dimitri Schoolwerth
2004-05-30 15:14:41 +00:00
parent 0063a4dce6
commit 0b4f47a319
11 changed files with 123 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
include/wx/log.h
View File

@@ -18,6 +18,24 @@
#include "wx/defs.h"
// ----------------------------------------------------------------------------
// common constants for use in wxUSE_LOG/!wxUSE_LOG
// ----------------------------------------------------------------------------
// the trace masks have been superceded by symbolic trace constants, they're
// for compatibility only andwill be removed soon - do NOT use them
// meaning of different bits of the trace mask (which allows selectively
// enable/disable some trace messages)
#define wxTraceMemAlloc 0x0001 // trace memory allocation (new/delete)
#define wxTraceMessages 0x0002 // trace window messages/X callbacks
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation
#define wxTraceRefCount 0x0008 // trace various ref counting operations
#ifdef __WXMSW__
#define wxTraceOleCalls 0x0100 // OLE interface calls
#endif
// ----------------------------------------------------------------------------
// types
// ----------------------------------------------------------------------------
@@ -93,20 +111,6 @@ enum
#define wxTRACE_OleCalls wxT("ole") // OLE interface calls
#endif
// the trace masks have been superceded by symbolic trace constants, they're
// for compatibility only andwill be removed soon - do NOT use them
// meaning of different bits of the trace mask (which allows selectively
// enable/disable some trace messages)
#define wxTraceMemAlloc 0x0001 // trace memory allocation (new/delete)
#define wxTraceMessages 0x0002 // trace window messages/X callbacks
#define wxTraceResAlloc 0x0004 // trace GDI resource allocation
#define wxTraceRefCount 0x0008 // trace various ref counting operations
#ifdef __WXMSW__
#define wxTraceOleCalls 0x0100 // OLE interface calls
#endif
#include "wx/iosfwrap.h"
// ----------------------------------------------------------------------------
@@ -444,9 +448,6 @@ extern void expdecl wxVLog##level(arg, const wxChar *szFormat, \
va_list argptr); \
extern void expdecl wxLog##level(arg, const wxChar *szFormat, \
...) 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
@@ -454,7 +455,7 @@ extern void expdecl wxLog##level(arg, const wxChar *szFormat, \
inline void wxVLog##level(const wxChar *szFormat, \
va_list argptr) { } \
inline void wxLog##level(const wxChar *szFormat, ...) { }
#define DECLARE_LOG_FUNCTION2(level, arg) \
#define DECLARE_LOG_FUNCTION2_EXP(level, arg, expdecl) \
inline void wxVLog##level(arg, const wxChar *szFormat, \
va_list argptr) {} \
inline void wxLog##level(arg, const wxChar *szFormat, ...) { }
@@ -474,6 +475,9 @@ public:
#define wxTRACE_OleCalls wxEmptyString // OLE interface calls
#endif // wxUSE_LOG/!wxUSE_LOG
#define DECLARE_LOG_FUNCTION2(level, arg) \
DECLARE_LOG_FUNCTION2_EXP(level, arg, WXDLLIMPEXP_BASE)
// a generic function for all levels (level is passes as parameter)
DECLARE_LOG_FUNCTION2(Generic, wxLogLevel level);
@@ -492,6 +496,7 @@ DECLARE_LOG_FUNCTION(Status);
#if wxUSE_GUI
// this one is the same as previous except that it allows to explicitly
class wxFrame;
// specify the frame to which the output should go
DECLARE_LOG_FUNCTION2_EXP(Status, wxFrame *pFrame, WXDLLIMPEXP_CORE);
#endif // wxUSE_GUI