From b2aef89b7a675805b601e757492c982031f38d21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Karsten=20Ball=C3=BCder?= Date: Fri, 10 Jul 1998 11:14:17 +0000 Subject: [PATCH] Cleared up DEBUG define mess, defines are now called __WXDEBUG__ and WXDEBUG. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@218 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/debug.h | 12 ++++---- include/wx/log.h | 4 +-- include/wx/memory.h | 8 +++--- include/wx/msw/ole/oleutils.h | 6 ++-- include/wx/msw/setup.h | 6 ++-- include/wx/object.h | 6 ++-- include/wx/utils.h | 2 +- install/gtk/configure | 2 +- install/gtk/configure.in | 2 +- samples/memcheck/memcheck.cpp | 4 +-- src/common/log.cpp | 10 +++---- src/common/memory.cpp | 12 ++++---- src/common/object.cpp | 8 +++--- src/gtk/setup/setup.hin | 6 ++-- src/gtk/setup/substit.in | 2 +- src/gtk1/setup/setup.hin | 6 ++-- src/gtk1/setup/substit.in | 2 +- src/makeb32.env | 2 +- src/makebcc.env | 2 +- src/makefile.dos | 6 ++-- src/makeg95.env | 10 +++---- src/makemsc.env | 4 +-- src/makewat.env | 4 +-- src/msw/app.cpp | 4 +-- src/msw/brush.cpp | 2 +- src/msw/dc.cpp | 26 ++++++++--------- src/msw/dcmemory.cpp | 2 +- src/msw/font.cpp | 2 +- src/msw/frame.cpp | 12 ++++---- src/msw/mdi.cpp | 24 ++++++++-------- src/msw/ole/dataobj.cpp | 2 +- src/msw/ole/oleutils.cpp | 4 +-- src/msw/pen.cpp | 2 +- src/msw/window.cpp | 54 +++++++++++++++++------------------ src/zlib/deflate.h | 4 +-- src/zlib/zutil.h | 2 +- user/wxLayout/wxllist.cpp | 20 ++++++------- user/wxLayout/wxllist.h | 10 +++---- user/wxLayout/wxlwindow.cpp | 4 +-- 39 files changed, 150 insertions(+), 150 deletions(-) diff --git a/include/wx/debug.h b/include/wx/debug.h index 1b7a5b1108..2f65767f4e 100644 --- a/include/wx/debug.h +++ b/include/wx/debug.h @@ -9,8 +9,8 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#ifndef __DEBUGH__ -#define __DEBUGH__ +#ifndef __WXDEBUGH__ +#define __WXDEBUGH__ #include @@ -31,7 +31,7 @@

Extensive use of these macros is recommended! Remember that ASSERTs are - disabled in final (without DEBUG defined) build, so they add strictly + disabled in final (without WXDEBUG defined) build, so they add strictly nothing to your program's code. On the other hand, CHECK macros do stay even in release builds, but in general are not much of a burden, while a judicious use of them might increase your program's stability. @@ -43,7 +43,7 @@ /** @name Macros which are completely disabled in 'release' mode */ //@{ -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ /** this function may be redefined to do something non trivial and is called whenever one of debugging macros fails (i.e. condition is false in an @@ -62,7 +62,7 @@ // no more bugs ;-) #define wxASSERT(cond) #define wxASSERT_MSG(x, m) -#endif //DEBUG +#endif //WXDEBUG /// special form of assert: always triggers it (in debug mode) #define wxFAIL wxASSERT(0) @@ -99,5 +99,5 @@ //@} -#endif // __DEBUGH__ +#endif // __WXDEBUGH__ diff --git a/include/wx/log.h b/include/wx/log.h index 5f55574c01..bad161e60f 100644 --- a/include/wx/log.h +++ b/include/wx/log.h @@ -283,7 +283,7 @@ DECLARE_LOG_FUNCTION(SysError); void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...); // debug functions do nothing in release mode -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ // NB: debug functions don't translate their arguments extern void WXDLLEXPORT wxLogDebug(const char *szFormat, ...); @@ -321,7 +321,7 @@ const char* WXDLLEXPORT wxSysErrorMsg(unsigned long nErrCode = 0); // debug only logging functions: use them with API name and error code // ---------------------------------------------------------------------------- -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ #define wxLogApiError(api, rc) \ wxLogDebug("At %s(%d) '%s' failed with error %lx (%s).", \ __FILE__, __LINE__, api, \ diff --git a/include/wx/memory.h b/include/wx/memory.h index 040ed1b042..1bc59b3058 100644 --- a/include/wx/memory.h +++ b/include/wx/memory.h @@ -23,7 +23,7 @@ info, or to be a straight call to the new operator. */ -#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && USE_MEMORY_TRACING) || USE_WXDEBUG_CONTEXT #include @@ -39,7 +39,7 @@ #define WXDEBUG_NEW new(__FILE__,__LINE__) #endif -#if DEBUG +#if WXDEBUG void * wxDebugAlloc(size_t size, char * fileName, int lineNum, bool isObject, bool isVect = FALSE); void wxDebugFree(void * buf, bool isVect = FALSE); @@ -263,7 +263,7 @@ void WXDLLEXPORT wxTraceLevel(int level, const char *fmt ...); #define WXTRACE wxTrace #define WXTRACELEVEL wxTraceLevel -#else // else part for the #if DEBUG +#else // else part for the #if WXDEBUG inline void wxTrace(const char *WXUNUSED(fmt)) {} inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {} @@ -272,7 +272,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {} #define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel #define WXDEBUG_NEW new -#endif // DEBUG +#endif // WXDEBUG #endif // __MEMORYH__ diff --git a/include/wx/msw/ole/oleutils.h b/include/wx/msw/ole/oleutils.h index b31268ca0b..60336d6444 100644 --- a/include/wx/msw/ole/oleutils.h +++ b/include/wx/msw/ole/oleutils.h @@ -121,7 +121,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount); // Debugging support // ============================================================================ -#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000) +#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000) // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- @@ -137,10 +137,10 @@ void wxLogQueryInterface(const char *szInterface, REFIID riid); void wxLogAddRef (const char *szInterface, ULONG cRef); void wxLogRelease(const char *szInterface, ULONG cRef); -#else //!DEBUG +#else //!WXDEBUG #define wxLogQueryInterface(szInterface, riid) #define wxLogAddRef(szInterface, cRef) #define wxLogRelease(szInterface, cRef) -#endif //DEBUG +#endif //WXDEBUG #endif //_OLEUTILS_H \ No newline at end of file diff --git a/include/wx/msw/setup.h b/include/wx/msw/setup.h index 3b84824403..c0e1000729 100644 --- a/include/wx/msw/setup.h +++ b/include/wx/msw/setup.h @@ -116,13 +116,13 @@ // NOW MANDATORY: don't change. #define USE_MEMORY_TRACING 1 // If 1, enables debugging versions of wxObject::new and - // wxObject::delete *IF* DEBUG is also defined. + // wxObject::delete *IF* WXDEBUG is also defined. // WARNING: this code may not work with all architectures, especially // if alignment is an issue. -#define USE_DEBUG_CONTEXT 1 +#define USE_WXDEBUG_CONTEXT 1 // If 1, enables wxDebugContext, for // writing error messages to file, etc. - // If DEBUG is not defined, will still use + // If WXDEBUG is not defined, will still use // normal memory operators. // It's recommended to set this to 1, // since you may well need to output diff --git a/include/wx/object.h b/include/wx/object.h index ea3b030deb..3d502ef930 100644 --- a/include/wx/object.h +++ b/include/wx/object.h @@ -206,7 +206,7 @@ class WXDLLEXPORT wxObject bool IsKindOf(wxClassInfo *info); -#if DEBUG && USE_MEMORY_TRACING +#if WXDEBUG && USE_MEMORY_TRACING void * operator new (size_t size, char * fileName = NULL, int lineNum = 0); void operator delete (void * buf); @@ -218,7 +218,7 @@ class WXDLLEXPORT wxObject #endif -#if DEBUG || USE_DEBUG_CONTEXT +#if WXDEBUG || USE_WXDEBUG_CONTEXT virtual void Dump(ostream& str); #endif @@ -256,7 +256,7 @@ private: int m_count; }; -#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS +#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS #ifndef WXDEBUG_NEW #define WXDEBUG_NEW new(__FILE__,__LINE__) #endif diff --git a/include/wx/utils.h b/include/wx/utils.h index 902863ce49..e2ef6fd635 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -182,7 +182,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf int sync(void); }; -#if DEBUG && USE_GLOBAL_MEMORY_OPERATORS +#if WXDEBUG && USE_GLOBAL_MEMORY_OPERATORS #define new WXDEBUG_NEW #endif diff --git a/install/gtk/configure b/install/gtk/configure index b0bba242d0..a762ef7593 100755 --- a/install/gtk/configure +++ b/install/gtk/configure @@ -5660,7 +5660,7 @@ fi if test "$USE_DEBUG_FLAG" = 1 ; then cat >> confdefs.h < #include -#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #include "wx/memory.h" #endif -#if DEBUG || USE_DEBUG_CONTEXT +#if WXDEBUG || USE_DEBUG_CONTEXT // for wxObject::Dump #include #endif @@ -69,7 +69,7 @@ bool wxObject::IsKindOf(wxClassInfo *info) return FALSE; } -#if DEBUG || USE_DEBUG_CONTEXT +#if WXDEBUG || USE_DEBUG_CONTEXT void wxObject::Dump(ostream& str) { if (GetClassInfo() && GetClassInfo()->GetClassName()) @@ -79,7 +79,7 @@ void wxObject::Dump(ostream& str) } #endif -#if DEBUG && USE_MEMORY_TRACING +#if WXDEBUG && USE_MEMORY_TRACING #ifdef new #undef new diff --git a/src/gtk/setup/setup.hin b/src/gtk/setup/setup.hin index c32074e37f..57c0e17ea4 100644 --- a/src/gtk/setup/setup.hin +++ b/src/gtk/setup/setup.hin @@ -183,7 +183,7 @@ /********************** DO NOT CHANGE BELOW THIS POINT **********************/ -/**************************** DEBUGGING FEATURES ****************************/ +/**************************** WXDEBUGGING FEATURES ****************************/ /* Compatibility with 1.66 API. Level 0: no backward compatibility, all new features @@ -193,9 +193,9 @@ /* * Enables debugging: memory tracing, assert, etc. */ -#undef DEBUG +#undef WXDEBUG /* - * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG) + * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) * WARNING: this code may not work with all architectures, especially * if alignment is an issue. */ diff --git a/src/gtk/setup/substit.in b/src/gtk/setup/substit.in index f8f4368041..9fff70df91 100644 --- a/src/gtk/setup/substit.in +++ b/src/gtk/setup/substit.in @@ -1,7 +1,7 @@ s|*OS*|@OS@|g s|*WXBASEDIR*|@WXBASEDIR@|g s|*PROFILE*|@PROFILE@|g -s|*DEBUG*|@DEBUG@|g +s|*WXDEBUG*|@WXDEBUG@|g s|*OPTIMISE*|@OPTIMISE@|g s|*CC*|@CC@|g s|*CFLAGS*|@CFLAGS@|g diff --git a/src/gtk1/setup/setup.hin b/src/gtk1/setup/setup.hin index c32074e37f..57c0e17ea4 100644 --- a/src/gtk1/setup/setup.hin +++ b/src/gtk1/setup/setup.hin @@ -183,7 +183,7 @@ /********************** DO NOT CHANGE BELOW THIS POINT **********************/ -/**************************** DEBUGGING FEATURES ****************************/ +/**************************** WXDEBUGGING FEATURES ****************************/ /* Compatibility with 1.66 API. Level 0: no backward compatibility, all new features @@ -193,9 +193,9 @@ /* * Enables debugging: memory tracing, assert, etc. */ -#undef DEBUG +#undef WXDEBUG /* - * Enables debugging version of wxObject::new and wxObject::delete (IF DEBUG) + * Enables debugging version of wxObject::new and wxObject::delete (IF WXDEBUG) * WARNING: this code may not work with all architectures, especially * if alignment is an issue. */ diff --git a/src/gtk1/setup/substit.in b/src/gtk1/setup/substit.in index f8f4368041..9fff70df91 100644 --- a/src/gtk1/setup/substit.in +++ b/src/gtk1/setup/substit.in @@ -1,7 +1,7 @@ s|*OS*|@OS@|g s|*WXBASEDIR*|@WXBASEDIR@|g s|*PROFILE*|@PROFILE@|g -s|*DEBUG*|@DEBUG@|g +s|*WXDEBUG*|@WXDEBUG@|g s|*OPTIMISE*|@OPTIMISE@|g s|*CC*|@CC@|g s|*CFLAGS*|@CFLAGS@|g diff --git a/src/makeb32.env b/src/makeb32.env index a75af4a4f8..2ecc973fdb 100644 --- a/src/makeb32.env +++ b/src/makeb32.env @@ -12,7 +12,7 @@ FINAL=0 !if "$(FINAL)" == "0" OPT = -Od -DEBUG_FLAGS= -v -DDEBUG=1 -D__DEBUG__ -DUSE_DEFINE +DEBUG_FLAGS= -v -DWXDEBUG=1 -D__WXDEBUG__ -DUSE_DEFINE !else OPT = -O2 DEBUG_FLAGS = -DUSE_DEFINE diff --git a/src/makebcc.env b/src/makebcc.env index 139c057a17..70b5f43388 100644 --- a/src/makebcc.env +++ b/src/makebcc.env @@ -14,7 +14,7 @@ FINAL=0 !if "$(FINAL)" == "0" LINKFLAGS=/v/Vt /Twe /L$(WXDIR)\lib;$(BCCDIR)\lib OPT = -Od -DEBUG_FLAGS= -v -D__DEBUG__ -DDEBUG=1 +DEBUG_FLAGS= -v -D__WXDEBUG__ -DWXDEBUG=1 !else LINKFLAGS=/Twe /L$(WXDIR)\lib;$(BCCDIR)\lib OPT = -O2 diff --git a/src/makefile.dos b/src/makefile.dos index d734f4a817..4e5afd4ce7 100644 --- a/src/makefile.dos +++ b/src/makefile.dos @@ -31,13 +31,13 @@ WXBASEINC = $(WXDIR)\include\base FINAL=0 !endif -!ifndef DEBUG -DEBUG=0 +!ifndef WXDEBUG +WXDEBUG=0 !endif all: cd $(WXDIR)\src\msw - nmake -f makefile.dos FINAL=$(FINAL) DEBUG=$(DEBUG) + nmake -f makefile.dos FINAL=$(FINAL) WXDEBUG=$(WXDEBUG) cd $(THISDIR) clean: diff --git a/src/makeg95.env b/src/makeg95.env index 3b37cdd321..84ced2d245 100644 --- a/src/makeg95.env +++ b/src/makeg95.env @@ -8,7 +8,7 @@ # to override makefile variables. See wx/install/install.txt. # And you can override specific variables on the make command line, e.g. # -# make -f makefile.unix DEBUG='' +# make -f makefile.unix WXDEBUG='' # # You may prefer to use the GNU configure script than raw makefiles - # see contrib/wxshlib. @@ -64,10 +64,10 @@ OPTIONS= # -D__MINGW32__ # -D__EGCS__ # Debugging information # AIX: comment out. # IRIX: -g3 -DEBUGFLAGS = -ggdb -D__DEBUG__ +DEBUGFLAGS = -ggdb -D__WXDEBUG__ # Debug/trace mode. 1 or more for debugging. -DEBUG=0 +WXDEBUG=0 WIN95=1 @@ -203,8 +203,8 @@ LDLIBS = $(LIBS) OBJDIR = objects$(GUISUFFIX) # You shouldn't need to change these... -CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) -CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DDEBUG='$(DEBUG)' $(WARN) $(OPT) +CPPFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) +CFLAGS = $(XINCLUDE) $(INC) $(OPTIONS) $(GUI) $(DEBUGFLAGS) -DWXDEBUG='$(WXDEBUG)' $(WARN) $(OPT) LDFLAGS = -Wl,--subsystem,windows -mwindows -L$(WXDIR)/lib # Extra patch link for XView diff --git a/src/makemsc.env b/src/makemsc.env index 75d7950a5f..99305c33db 100644 --- a/src/makemsc.env +++ b/src/makemsc.env @@ -56,8 +56,8 @@ LIBS=$(WXLIB) $(EXTRALIBS) oldnames libw llibcew commdlg ddeml shell mmsystem $( !if "$(DLL)" == "0" PCH=WX.PCH PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) -CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DDEBUG=1 /D__DEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ $(PRECOMP) -CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DDEBUG=1 /D__DEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ +CPPFLAGS= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ $(PRECOMP) +CPPFLAGS2= $(DEBUG_FLAGS) $(OPTIONS) $(INC) $(EXTRAFLAGS) /DWXDEBUG=1 /D__WXDEBUG__ /AL /Gt4 /Gx- /W4 /G2sw $(OPT) /D__WINDOWS__ LINKFLAGS=$(LINK_DEBUG_FLAGS) /NOD /SEG:512 /ONERROR:NOEXE DUMMY=dummy !else diff --git a/src/makewat.env b/src/makewat.env index c4281cc084..19b8babfaf 100644 --- a/src/makewat.env +++ b/src/makewat.env @@ -24,7 +24,7 @@ WXBASEINC = $(WXDIR)\include\base OBJSUFF=obj SRCSUFF=cpp -DEBUG=0 +WXDEBUG=0 !ifneq NOPRECOMP 1 PRECOMP = /fh=$(WXDIR)\src\msw\watcom.pch @@ -127,7 +127,7 @@ DEBUGINFO = debug all # Linking: comment out if operating in a non-debuggable # The Watcom-recommended flags for optimum Pentium speed are: # /oneatx /zp4 /5 /fpi87 /fp5 -OPTFLAGS=/ox /5r # /DDEBUG=1 +OPTFLAGS=/ox /5r # /DWXDEBUG=1 # /d1 for line numbers only: anything else produces an enormous wx32.lib CPPFLAGS = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WINDOWS__ $(EXTRACPPFLAGS) diff --git a/src/msw/app.cpp b/src/msw/app.cpp index 5543717f13..40327418c1 100644 --- a/src/msw/app.cpp +++ b/src/msw/app.cpp @@ -422,7 +422,7 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_ { wxhInstance = (HINSTANCE) hInstance; -#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT #if !defined(_WINDLL) streambuf* sBuf = new wxDebugStreamBuf; @@ -574,7 +574,7 @@ int wxEntry(WXHINSTANCE hInstance, WXHINSTANCE WXUNUSED(hPrevInstance), char *m_ delete [] command[0] ; delete [] command ; -#if (DEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT +#if (WXDEBUG && USE_MEMORY_TRACING) || USE_DEBUG_CONTEXT // At this point we want to check if there are any memory // blocks that aren't part of the wxDebugContext itself, // as a special case. Then when dumping we need to ignore diff --git a/src/msw/brush.cpp b/src/msw/brush.cpp index 43dbfae933..f9043c2e1d 100644 --- a/src/msw/brush.cpp +++ b/src/msw/brush.cpp @@ -161,7 +161,7 @@ bool wxBrush::RealizeResource(void) M_BRUSHDATA->m_hBrush = (WXHBRUSH) CreateSolidBrush(ms_colour) ; break; } -#ifdef DEBUG_CREATE +#ifdef WXDEBUG_CREATE if (M_BRUSHDATA->m_hBrush==NULL) wxError("Cannot create brush","Internal error") ; #endif return TRUE; diff --git a/src/msw/dc.cpp b/src/msw/dc.cpp index 6d6ce018cc..bdecb6b626 100644 --- a/src/msw/dc.cpp +++ b/src/msw/dc.cpp @@ -130,14 +130,14 @@ wxDC::~wxDC(void) // DC. void wxDC::SelectOldObjects(WXHDC dc) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects %X\n", this); #endif if (dc) { if (m_oldBitmap) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBITMAP %X\n", m_oldBitmap); #endif ::SelectObject((HDC) dc, (HBITMAP) m_oldBitmap); @@ -149,7 +149,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBitmap = 0 ; if (m_oldPen) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPEN %X\n", m_oldPen); #endif ::SelectObject((HDC) dc, (HPEN) m_oldPen); @@ -157,7 +157,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldPen = 0 ; if (m_oldBrush) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HBRUSH %X\n", m_oldBrush); #endif ::SelectObject((HDC) dc, (HBRUSH) m_oldBrush); @@ -165,7 +165,7 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldBrush = 0 ; if (m_oldFont) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HFONT %X\n", m_oldFont); #endif ::SelectObject((HDC) dc, (HFONT) m_oldFont); @@ -173,12 +173,12 @@ void wxDC::SelectOldObjects(WXHDC dc) m_oldFont = 0 ; if (m_oldPalette) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Selecting old HPALETTE %X\n", m_oldPalette); #endif ::SelectPalette((HDC) dc, (HPALETTE) m_oldPalette, TRUE); } -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SelectOldObjects: Done.\n"); #endif m_oldPalette = 0 ; @@ -217,11 +217,11 @@ void wxDC::DestroyClippingRegion(void) if (m_clipping && m_hDC) { HRGN rgn = CreateRectRgn(0, 0, 32000, 32000); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Selecting HRGN %X\n", rgn); #endif SelectClipRgn((HDC) m_hDC, rgn); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DestroyClippingRegion: Deleting HRGN %X\n", rgn); #endif DeleteObject(rgn); @@ -267,7 +267,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (m_oldPalette) { ::SelectPalette((HDC) m_hDC, (HPALETTE) m_oldPalette, TRUE); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette: set old palette %X\n", m_oldPalette); #endif m_oldPalette = 0; @@ -282,7 +282,7 @@ void wxDC::SetPalette(const wxPalette& palette) if (!m_oldPalette) m_oldPalette = (WXHPALETTE) oldPal; -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetPalette %X: selected palette %X\n", this, m_palette.GetHPALETTE()); if (oldPal) wxDebugMsg("wxDC::SetPalette: oldPal was palette %X\n", oldPal); @@ -639,7 +639,7 @@ void wxDC::SetFont(const wxFont& the_font) if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::SetFont: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); @@ -713,7 +713,7 @@ void wxDC::DrawText(const wxString& text, long x, long y, bool use16bit) { if (m_font.Ok() && m_font.GetResourceHandle()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxDC::DrawText: Selecting HFONT %X\n", m_font.GetResourceHandle()); #endif HFONT f = (HFONT) ::SelectObject((HDC) m_hDC, (HFONT) m_font.GetResourceHandle()); diff --git a/src/msw/dcmemory.cpp b/src/msw/dcmemory.cpp index 34920234b1..42e0a0b97a 100644 --- a/src/msw/dcmemory.cpp +++ b/src/msw/dcmemory.cpp @@ -91,7 +91,7 @@ void wxMemoryDC::SelectObject(const wxBitmap& bitmap) return; m_selectedBitmap.SetSelectedInto(this); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxMemoryDC::SelectObject: Selecting HBITMAP %X\n", m_selectedBitmap.GetHBITMAP()); #endif HBITMAP bm = ::SelectObject((HDC) m_hDC, (HBITMAP) m_selectedBitmap.GetHBITMAP()); diff --git a/src/msw/font.cpp b/src/msw/font.cpp index 48a127d8f9..4541dbf2f6 100644 --- a/src/msw/font.cpp +++ b/src/msw/font.cpp @@ -197,7 +197,7 @@ bool wxFont::RealizeResource(void) M_FONTDATA->m_hFont = (WXHFONT) CreateFont(nHeight, 0, 0, 0,ff_weight,ff_italic,(BYTE)ff_underline, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, PROOF_QUALITY, DEFAULT_PITCH | ff_family, (ff_face == "" ? NULL : (const char *)ff_face)); -#ifdef DEBUG_CREATE +#ifdef WXDEBUG_CREATE if (m_hFont==NULL) wxError("Cannot create font","Internal Error") ; #endif return (M_FONTDATA->m_hFont != (WXHFONT) NULL); diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp index 380bcc95a2..a746bf4da8 100644 --- a/src/msw/frame.cpp +++ b/src/msw/frame.cpp @@ -596,7 +596,7 @@ void wxFrame::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow * bool wxFrame::MSWOnPaint(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnPaint %d\n", handle); #endif RECT rect; @@ -653,7 +653,7 @@ WXHICON wxFrame::MSWOnQueryDragIcon(void) void wxFrame::MSWOnSize(int x, int y, WXUINT id) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnSize %d\n", m_hWnd); #endif switch (id) @@ -690,7 +690,7 @@ void wxFrame::MSWOnSize(int x, int y, WXUINT id) bool wxFrame::MSWOnClose(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnClose %d\n", handle); #endif return Close(); @@ -698,7 +698,7 @@ bool wxFrame::MSWOnClose(void) bool wxFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrameWnd::OnCommand %d\n", handle); #endif if (cmd == 0 || cmd == 1 ) // Can be either a menu command or an accelerator. @@ -782,7 +782,7 @@ void wxFrame::OnSize(wxSizeEvent& event) { int client_x, client_y; -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrame::OnSize: about to set the child's size.\n"); #endif @@ -803,7 +803,7 @@ void wxFrame::OnActivate(wxActivateEvent& event) if (!child->IsKindOf(CLASSINFO(wxFrame)) && !child->IsKindOf(CLASSINFO(wxDialog))) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxFrame::OnActivate: about to set the child's focus.\n"); #endif child->SetFocus(); diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp index 437f46b068..dfb324db7f 100644 --- a/src/msw/mdi.cpp +++ b/src/msw/mdi.cpp @@ -121,7 +121,7 @@ bool wxMDIParentFrame::Create(wxWindow *parent, m_windowMenu = (WXHMENU) ::LoadMenu(wxGetInstance(), "wxWindowMenu"); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Loaded m_windowMenu %d\n", m_windowMenu); #endif @@ -514,7 +514,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) } if (id >= 0xF000) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxMDIFrame::OnCommand %d: system command: calling default window proc\n", GetHWND()); #endif return FALSE; // Get WndProc to call default proc @@ -527,7 +527,7 @@ bool wxMDIParentFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) } else if (m_currentChild && (id < wxFIRST_MDI_CHILD || id > wxLAST_MDI_CHILD)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxMDIFrame::MSWOnCommand %d: calling child OnCommand\n", GetHWND()); #endif return m_currentChild->MSWOnCommand(id, cmd, control); @@ -883,7 +883,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id) if (invalidHandle == (HWND) GetHWND()) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxMDIChildFrame::OnSize %d: invalid, so returning.\n", GetHWND()); #endif return; @@ -923,7 +923,7 @@ void wxMDIChildFrame::MSWOnSize(int x, int y, WXUINT id) bool wxMDIChildFrame::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND control) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxMDIChildFrame::MSWOnCommand %d\n", GetHWND()); #endif if ((cmd == 0) && GetHWND()) @@ -969,11 +969,11 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW { wxMDIParentFrame *parent = (wxMDIParentFrame *)GetParent(); HMENU parent_menu = (HMENU) parent->GetWinMenu(); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Parent menu is %d\n", parent_menu); #endif HMENU child_menu = (HMENU) GetWinMenu(); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Child menu is %d\n", child_menu); #endif @@ -985,7 +985,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW { parent->m_parentFrameActive = FALSE; HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Window submenu is %d\n", subMenu); #endif // HMENU subMenu = 0; @@ -1018,7 +1018,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW { parent->m_parentFrameActive = TRUE; HMENU subMenu = GetSubMenu((HMENU) parent->GetWindowMenu(), 0); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Window submenu is %d\n", subMenu); #endif // HMENU subMenu = 0; @@ -1039,7 +1039,7 @@ long wxMDIChildFrame::MSWOnMDIActivate(long activate, WXHWND WXUNUSED(one), WXHW event.SetEventObject( this ); GetEventHandler()->ProcessEvent(event); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Finished (de)activating\n"); #endif return 0; @@ -1058,7 +1058,7 @@ void wxMDIChildFrame::MSWDestroyWindow(void) // destroyed. HWND oldHandle = (HWND)GetHWND(); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("*** About to DestroyWindow MDI child %d\n", oldHandle); #endif #ifdef __WIN32__ @@ -1066,7 +1066,7 @@ void wxMDIChildFrame::MSWDestroyWindow(void) #else SendMessage((HWND) parent->GetClientWindow()->GetHWND(), WM_MDIDESTROY, (HWND)oldHandle, 0); #endif -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("*** Finished DestroyWindow MDI child %d\n", oldHandle); #endif invalidHandle = 0; diff --git a/src/msw/ole/dataobj.cpp b/src/msw/ole/dataobj.cpp index fd57f7de78..3a5d1fa49d 100644 --- a/src/msw/ole/dataobj.cpp +++ b/src/msw/ole/dataobj.cpp @@ -357,7 +357,7 @@ wxDataObject::~wxDataObject() const char *wxDataObject::GetFormatName(wxDataFormat format) { -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ static char s_szBuf[128]; switch ( format ) { case CF_TEXT: return "CF_TEXT"; diff --git a/src/msw/ole/oleutils.cpp b/src/msw/ole/oleutils.cpp index b50b99c2c6..2de92ce709 100644 --- a/src/msw/ole/oleutils.cpp +++ b/src/msw/ole/oleutils.cpp @@ -64,7 +64,7 @@ bool IsIidFromList(REFIID riid, const IID *aIids[], size_t nCount) // Debug support // ---------------------------------------------------------------------------- -#if defined(__DEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000) +#if defined(__WXDEBUG__) && defined(_MSC_VER) && (_MSC_VER > 1000) const char *GetIidName(REFIID riid) { // an association between symbolic name and numeric value of an IID @@ -186,7 +186,7 @@ void wxLogRelease(const char *szInterface, ULONG cRef) wxLogTrace("After %s::Release: m_cRef = %d", szInterface, cRef - 1); } -#endif //DEBUG +#endif //WXDEBUG #endif // USE_DRAG_AND_DROP diff --git a/src/msw/pen.cpp b/src/msw/pen.cpp index 12197dd801..2818565949 100644 --- a/src/msw/pen.cpp +++ b/src/msw/pen.cpp @@ -260,7 +260,7 @@ bool wxPen::RealizeResource(void) #else M_PENDATA->m_hPen = (WXHPEN) CreatePen(wx2msPenStyle(M_PENDATA->m_style), M_PENDATA->m_width, ms_colour); #endif -#ifdef DEBUG_CREATE +#ifdef WXDEBUG_CREATE if (M_PENDATA->m_hPen==0) wxError("Cannot create pen","Internal error") ; #endif diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 0858f7afe9..bfa74f9f0b 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -80,9 +80,9 @@ #undef GetClassInfo #endif -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ static const char *GetMessageName(int message); -#endif //DEBUG +#endif //WXDEBUG #define WINDOW_MARGIN 3 // This defines sensitivity of Leave events @@ -866,7 +866,7 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA wxWndHook = NULL; wnd->m_hWnd = (WXHWND) hWnd; } -#if (DEBUG > 1) +#if (WXDEBUG > 1) wxDebugMsg("hWnd = %d, m_hWnd = %d, msg = %d\n", hWnd, m_hWnd, message); #endif // Stop right here if we don't have a valid handle @@ -900,9 +900,9 @@ LRESULT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA // Main Windows 3 window proc long wxWindow::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { - #ifdef __DEBUG__ + #ifdef __WXDEBUG__ wxLogTrace(wxTraceMessages, "Processing %s", GetMessageName(message)); - #endif // DEBUG + #endif // WXDEBUG HWND hWnd = (HWND)m_hWnd; @@ -1436,7 +1436,7 @@ void wxWindow::MSWDestroyWindow(void) { #if 0 -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWDestroyWindow %d\n", handle); #endif MSWDetachWindowMenu(); @@ -1541,7 +1541,7 @@ void wxWindow::MSWCreate(int id, wxWindow *parent, const char *wclass, wxWindow wxWndHook = NULL; wxWinHandleList->Append((long)m_hWnd, this); -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWCreate %d\n", m_hWnd); #endif } @@ -1552,7 +1552,7 @@ void wxWindow::MSWOnCreate(WXLPCREATESTRUCT WXUNUSED(cs)) bool wxWindow::MSWOnClose(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnClose %d\n", handle); #endif return FALSE; @@ -1560,7 +1560,7 @@ bool wxWindow::MSWOnClose(void) bool wxWindow::MSWOnDestroy(void) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnDestroy %d\n", handle); #endif // delete our drop target if we've got one @@ -1621,7 +1621,7 @@ bool wxWindow::MSWOnNotify(WXWPARAM wParam, WXLPARAM lParam) void wxWindow::MSWOnMenuHighlight(WXWORD WXUNUSED(item), WXWORD WXUNUSED(flags), WXHMENU WXUNUSED(sysmenu)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnMenuHighlight %d\n", handle); #endif } @@ -1632,7 +1632,7 @@ void wxWindow::MSWOnInitMenuPopup(WXHMENU menu, int pos, bool isSystem) bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSED(activate)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnActivate %d\n", handle); #endif @@ -1645,7 +1645,7 @@ bool wxWindow::MSWOnActivate(int state, bool WXUNUSED(minimized), WXHWND WXUNUSE bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnSetFocus %d\n", m_hWnd); #endif // Deal with caret @@ -1665,7 +1665,7 @@ bool wxWindow::MSWOnSetFocus(WXHWND WXUNUSED(hwnd)) bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnKillFocus %d\n", m_hWnd); #endif // Deal with caret @@ -1683,7 +1683,7 @@ bool wxWindow::MSWOnKillFocus(WXHWND WXUNUSED(hwnd)) void wxWindow::MSWOnDropFiles(WXWPARAM wParam) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnDropFiles %d\n", m_hWnd); #endif @@ -1776,7 +1776,7 @@ bool wxWindow::MSWOnMeasureItem(int id, WXMEASUREITEMSTRUCT *itemStruct) WXHBRUSH wxWindow::MSWOnCtlColor(WXHDC pDC, WXHWND pWnd, WXUINT nCtlColor, WXUINT message, WXWPARAM wParam, WXLPARAM lParam) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnCtlColour %d\n", m_hWnd); #endif if (nCtlColor == CTLCOLOR_DLG) @@ -1852,10 +1852,10 @@ long wxWindow::Default() if (m_lastMsg == 0) return 0; - #ifdef __DEBUG__ + #ifdef __WXDEBUG__ wxLogTrace(wxTraceMessages, "Forwarding %s to DefWindowProc.", GetMessageName(m_lastMsg)); - #endif // DEBUG + #endif // WXDEBUG return this->MSWDefWindowProc(m_lastMsg, m_lastWParam, m_lastLParam); } @@ -1930,7 +1930,7 @@ bool wxWindow::MSWProcessMessage(WXMSG* pMsg) long wxWindow::MSWOnMDIActivate(long WXUNUSED(flag), WXHWND WXUNUSED(activate), WXHWND WXUNUSED(deactivate)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnMDIActivate %d\n", m_hWnd); #endif return 1; @@ -1969,7 +1969,7 @@ void wxWindow::MSWOnSize(int w, int h, WXUINT WXUNUSED(flag)) if (m_inOnSize) return; -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnSize %d\n", m_hWnd); #endif if (!m_hWnd) @@ -1993,7 +1993,7 @@ void wxWindow::MSWOnWindowPosChanging(void *WXUNUSED(lpPos)) // Deal with child commands from buttons etc. bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control)) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxWindow::MSWOnCommand\n"); #endif if (wxCurrentPopupMenu) @@ -2003,7 +2003,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control)) bool succ = popupMenu->MSWCommand(cmd, id); return succ; } -#if DEBUG > 1 +#if WXDEBUG > 1 char buf[80]; sprintf(buf, "Looking for item %d...\n", id); wxDebugMsg(buf); @@ -2013,7 +2013,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control)) if (item) { bool value = item->MSWCommand(cmd, id); -#if DEBUG > 1 +#if WXDEBUG > 1 if (value) wxDebugMsg("MSWCommand succeeded\n"); else @@ -2023,7 +2023,7 @@ bool wxWindow::MSWOnCommand(WXWORD id, WXWORD cmd, WXHWND WXUNUSED(control)) } else { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("Could not find item!\n"); char buf[100]; wxDebugMsg("Item ids for this panel:\n"); @@ -2642,7 +2642,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) HFONT was = 0; if (the_font) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxGetCharSize: Selecting HFONT %X\n", fnt); #endif // the_font->UseResource(); @@ -2653,7 +2653,7 @@ void wxGetCharSize(WXHWND wnd, int *x, int *y,wxFont *the_font) GetTextMetrics(dc, &tm); if (the_font && fnt && was) { -#if DEBUG > 1 +#if WXDEBUG > 1 wxDebugMsg("wxGetCharSize: Selecting old HFONT %X\n", was); #endif SelectObject(dc,was) ; @@ -4518,7 +4518,7 @@ bool wxWindow::AcceptsFocus() const return IsShown() && IsEnabled(); } -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ static const char *GetMessageName(int message) { switch ( message ) { @@ -4659,4 +4659,4 @@ static const char *GetMessageName(int message) return s_szBuf; } } -#endif //DEBUG +#endif //WXDEBUG diff --git a/src/zlib/deflate.h b/src/zlib/deflate.h index 04830164dd..6273d3976c 100644 --- a/src/zlib/deflate.h +++ b/src/zlib/deflate.h @@ -234,7 +234,7 @@ typedef struct internal_state { uInt matches; /* number of string matches in current block */ int last_eob_len; /* bit length of EOB code for last block */ -#ifdef DEBUG +#ifdef WXDEBUG ulg bits_sent; /* bit length of the compressed data */ #endif @@ -281,7 +281,7 @@ void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len, * used. */ -#ifndef DEBUG +#ifndef WXDEBUG /* Inline versions of _tr_tally for speed: */ #if defined(GEN_TREES_H) || !defined(STDC) diff --git a/src/zlib/zutil.h b/src/zlib/zutil.h index 5a832dd7dd..e6a07d2e64 100644 --- a/src/zlib/zutil.h +++ b/src/zlib/zutil.h @@ -188,7 +188,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* Diagnostic functions */ -#ifdef DEBUG +#ifdef WXDEBUG # include extern int z_verbose; extern void z_error OF((char *m)); diff --git a/user/wxLayout/wxllist.cpp b/user/wxLayout/wxllist.cpp index 04da4bbfdc..925fad2d92 100644 --- a/user/wxLayout/wxllist.cpp +++ b/user/wxLayout/wxllist.cpp @@ -29,7 +29,7 @@ #define DBG_POINT(p) cerr << #p << ": " << p.x << ',' << p.y << endl #define TRACE(f) cerr << #f":" << endl; -#ifdef DEBUG +#ifdef WXDEBUG static const char *_t[] = { "invalid", "text", "cmd", "icon", "linebreak"}; @@ -72,12 +72,12 @@ wxLayoutObjectText::Draw(wxDC &dc, wxPoint position, CoordType baseLine, position.y += baseLine-m_BaseLine; if(draw) dc.DrawText(m_Text,position.x,position.y); -# ifdef DEBUG +# ifdef WXDEBUG // dc.DrawRectangle(position.x, position.y, m_Width, m_Height); # endif } -#ifdef DEBUG +#ifdef WXDEBUG void wxLayoutObjectText::Debug(void) { @@ -397,7 +397,7 @@ wxLayoutList::Draw(wxDC &dc, bool findObject, wxPoint const &findCoords) return foundObject; } -#ifdef DEBUG +#ifdef WXDEBUG void wxLayoutList::Debug(void) { @@ -447,7 +447,7 @@ wxLayoutList::FindObjectCursor(wxPoint const &cpos, CoordType *offset) CoordType width; wxLayoutObjectList::iterator i; -#ifdef DEBUG +#ifdef WXDEBUG cerr << "Looking for object at " << cpos.x << ',' << cpos.y << endl; #endif @@ -474,14 +474,14 @@ wxLayoutList::FindObjectCursor(wxPoint const &cpos, CoordType *offset) if(offset) *offset = cpos.x-(cursor.x-width); // 0==cursor before // the object -#ifdef DEBUG +#ifdef WXDEBUG cerr << " found object at " << cursor.x-width << ',' << cursor.y << ", type:" << _t[(*i)->GetType()] < lineLength) m_CursorPosition.x = lineLength; -#ifdef DEBUG +#ifdef WXDEBUG i = FindCurrentObject(&offs); cerr << "Cursor: " << m_CursorPosition.x << ',' @@ -609,7 +609,7 @@ wxLayoutList::Delete(CoordType count) i = FindCurrentObject(&offs); if(i == end()) return; -#ifdef DEBUG +#ifdef WXDEBUG cerr << "trying to delete: " << _t[(*i)->GetType()] << endl; #endif if((*i)->GetType() == WXLO_TYPE_LINEBREAK) @@ -678,7 +678,7 @@ wxLayoutList::Insert(wxLayoutObjectBase *obj) if((*i)->GetType() == WXLO_TYPE_TEXT && offs != 0 && offs != (*i)->CountPositions()) { wxLayoutObjectText *tobj = (wxLayoutObjectText *) *i; -#ifdef DEBUG +#ifdef WXDEBUG cerr << "text: '" << tobj->GetText() << "'" << endl; VAR(offs); #endif diff --git a/user/wxLayout/wxllist.h b/user/wxLayout/wxllist.h index e9c5c0f8a9..8d99808069 100644 --- a/user/wxLayout/wxllist.h +++ b/user/wxLayout/wxllist.h @@ -16,8 +16,8 @@ #include -#ifndef DEBUG -# define DEBUG +#ifndef WXDEBUG +# define WXDEBUG #endif @@ -52,7 +52,7 @@ public: wxLayoutObjectBase() { m_UserData = NULL; } virtual ~wxLayoutObjectBase() {} -#ifdef DEBUG +#ifdef WXDEBUG virtual void Debug(void); #endif @@ -75,7 +75,7 @@ public: align text objects. */ virtual wxPoint GetSize(CoordType *baseLine) const; -#ifdef DEBUG +#ifdef WXDEBUG virtual void Debug(void); #endif @@ -182,7 +182,7 @@ public: wxLayoutObjectBase *Draw(wxDC &dc, bool findObject = false, wxPoint const &coords = wxPoint(0,0)); -#ifdef DEBUG +#ifdef WXDEBUG void Debug(void); #endif diff --git a/user/wxLayout/wxlwindow.cpp b/user/wxLayout/wxlwindow.cpp index fd77b00bed..333fd782b2 100644 --- a/user/wxLayout/wxlwindow.cpp +++ b/user/wxLayout/wxlwindow.cpp @@ -37,7 +37,7 @@ wxLayoutWindow::OnMouse(wxMouseEvent& event) m_FindPos.y = event.GetY(); m_FoundObject = NULL; -#ifdef DEBUG +#ifdef WXDEBUG cerr << "OnMouse: " << m_FindPos.x << ',' << m_FindPos.y << endl; #endif Refresh(); @@ -90,7 +90,7 @@ wxLayoutWindow::OnChar(wxKeyEvent& event) case WXK_RETURN: m_llist.LineBreak(); break; -#ifdef DEBUG +#ifdef WXDEBUG case WXK_F1: m_llist.Debug(); break; -- 2.45.2