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

Removed references to DEBUG and WXDEBUG; cured Motif font problem; removed

Browse Source 
some warnings in OGL; fixed bug in wxChoice


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1998-11-09 11:57:05 +00:00
parent 605c9c8318
commit ea57084d10
47 changed files with 205 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/debug.h
View File

@@ -31,7 +31,7 @@
<BR>
<BR>
Extensive use of these macros is recommended! Remember that ASSERTs are
disabled in final (without WXDEBUG 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.
@@ -62,7 +62,7 @@
// no more bugs ;-)
#define wxASSERT(cond)
#define wxASSERT_MSG(x, m)
#endif //WXDEBUG
#endif //__WXDEBUG__
/// special form of assert: always triggers it (in debug mode)
#define wxFAIL wxASSERT(wxFalse)

4
include/wx/defs.h
View File

@@ -290,8 +290,8 @@ WXDLLEXPORT_DATA(extern const bool) wxFalse;
// where should i put this? we need to make sure of this as it breaks
// the <iostream> code.
#if !wxUSE_IOSTREAMH && WXDEBUG
#undef WXDEBUG
#if !wxUSE_IOSTREAMH && defined(__WXDEBUG__)
#undef __WXDEBUG__
#endif
// Callback function type definition

6
include/wx/memory.h
View File

@@ -23,7 +23,7 @@
info, or to be a straight call to the new operator.
*/
#if (WXDEBUG && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
#include <stddef.h>
@@ -39,7 +39,7 @@
#include "wx/string.h"
#if WXDEBUG
#ifdef __WXDEBUG__
// #ifndef WXDEBUG_NEW
// #define WXDEBUG_NEW new(__FILE__,__LINE__)
@@ -280,7 +280,7 @@ inline void wxTraceLevel(int WXUNUSED(level), const char *WXUNUSED(fmt)) {}
#define WXTRACELEVEL TRUE ? (void)0 : wxTraceLevel
// #define WXDEBUG_NEW new
#endif // WXDEBUG
#endif // __WXDEBUG__
#endif
// _WX_MEMORYH__

2
include/wx/motif/window.h
View File

@@ -402,7 +402,7 @@ public:
// Does this window want to accept keyboard focus?
virtual bool AcceptsFocus() const;
virtual void PrepareDC( wxDC &dc ) {};
virtual void PrepareDC( wxDC & WXUNUSED(dc) ) {};
public:

6
include/wx/object.h
View File

@@ -187,7 +187,7 @@ class WXDLLEXPORT wxObject
bool IsKindOf(wxClassInfo *info) const;
#if WXDEBUG && wxUSE_MEMORY_TRACING
#if defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING
void * operator new (size_t size, char * fileName = NULL, int lineNum = 0);
void operator delete (void * buf);
@@ -204,7 +204,7 @@ class WXDLLEXPORT wxObject
#endif
#if WXDEBUG || wxUSE_DEBUG_CONTEXT
#if defined(__WXDEBUG__) || wxUSE_DEBUG_CONTEXT
virtual void Dump(ostream& str);
#endif
@@ -246,7 +246,7 @@ private:
int m_count;
};
#if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
#if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
//#ifndef WXDEBUG_NEW
//#define WXDEBUG_NEW new(__FILE__,__LINE__)
//#endif

2
include/wx/utils.h
View File

@@ -187,7 +187,7 @@ class WXDLLEXPORT wxDebugStreamBuf: public streambuf
int sync(void);
};
// #if WXDEBUG && wxUSE_GLOBAL_MEMORY_OPERATORS
// #if defined(__WXDEBUG__) && wxUSE_GLOBAL_MEMORY_OPERATORS
// #define new WXDEBUG_NEW
// #endif