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

Added configure option --with-dmalloc to use the dmalloc memory debugging library.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Karsten Ballüder
1998-08-15 23:52:16 +00:00
parent 1280032d6c
commit 76f53a0e39
6 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ public:
{ return m_parent; } { return m_parent; }
wxWindow *GetGrandParent(void) const wxWindow *GetGrandParent(void) const
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); } { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void wxWindow::SetParent( wxWindow *p ) void SetParent( wxWindow *p )
{ m_parent = p; } { m_parent = p; }
wxEvtHandler *GetEventHandler(); wxEvtHandler *GetEventHandler();

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

@@ -120,7 +120,7 @@ public:
{ return m_parent; } { return m_parent; }
wxWindow *GetGrandParent(void) const wxWindow *GetGrandParent(void) const
{ return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); } { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
void wxWindow::SetParent( wxWindow *p ) void SetParent( wxWindow *p )
{ m_parent = p; } { m_parent = p; }
wxEvtHandler *GetEventHandler(); wxEvtHandler *GetEventHandler();

11
install/unix/configure.in
View File

@@ -654,6 +654,7 @@ DEFAULT_USE_PROFILE=0
DEFAULT_USE_DEBUG_FLAG=0 DEFAULT_USE_DEBUG_FLAG=0
DEFAULT_USE_DEBUG_INFO=0 DEFAULT_USE_DEBUG_INFO=0
DEFAULT_USE_MEM_TRACING=0 DEFAULT_USE_MEM_TRACING=0
DEFAULT_USE_DMALLOC=0
DEFAULT_USE_ZLIB=1 DEFAULT_USE_ZLIB=1
DEFAULT_USE_GDK_IMLIB=1 DEFAULT_USE_GDK_IMLIB=1
@@ -736,6 +737,10 @@ AC_OVERRIDES(mem_tracing,mem_tracing,
**--with-mem_traing create code with memory tracing, **--with-mem_traing create code with memory tracing,
USE_MEM_TRACING) USE_MEM_TRACING)
AC_OVERRIDES(dmalloc,dmalloc,
**--with-dmalloc use dmalloc memory debug library (www.letters.com/dmalloc/),
USE_DMALLOC)
AC_OVERRIDES(profile,profile, AC_OVERRIDES(profile,profile,
**--with-profile create code with profiling information included, **--with-profile create code with profiling information included,
USE_PROFILE) USE_PROFILE)
@@ -1042,6 +1047,12 @@ if test "$USE_MEM_TRACING" = 1 ; then
dnl AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING) dnl AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
fi fi
EXTRA_LINK=
if test "$USE_DMALLOC" = 1 ; then
EXTRA_LINK="$EXTRA_LINK -ldmalloc"
fi
AC_SUBST(EXTRA_LINK)
PROFILE= PROFILE=
if test "$USE_PROFILE" = 1 ; then if test "$USE_PROFILE" = 1 ; then
PROFILE="-pg" PROFILE="-pg"

4
install/unix/setup/maketmpl.in
View File

@@ -88,6 +88,7 @@ OPENGL_LIBRARY = @OPENGL_LIBRARY@
OPENGL_LINK = @OPENGL_LINK@ OPENGL_LINK = @OPENGL_LINK@
THREADS_LINK = @THREADS_LINK@ THREADS_LINK = @THREADS_LINK@
EXTRA_LINK = @EXTRA_LINK@
# INCLUDES # INCLUDES
WX_INCLUDES = \ WX_INCLUDES = \
@@ -116,7 +117,8 @@ LINK_LIBS= \
$(GUI_TK_LIBS) \ $(GUI_TK_LIBS) \
$(X_EXTRA_LIBS) \ $(X_EXTRA_LIBS) \
$(X_PRE_LIBS) \ $(X_PRE_LIBS) \
$(THREADS_LINK) $(THREADS_LINK) \
$(EXTRA_LINK)
# Don't include $(OPENGL_LIBS) in LINK_LIBS; they # Don't include $(OPENGL_LIBS) in LINK_LIBS; they
# can be conveniently added to BIN_LINK in Makefile.in. # can be conveniently added to BIN_LINK in Makefile.in.

1
install/unix/setup/substit.in
View File

@@ -43,6 +43,7 @@ s|*TOOLKIT*|@TOOLKIT@|g
s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
s|*THREADS*|@THREADS@|g s|*THREADS*|@THREADS@|g
s|*THREADS_LINK*|@THREADS_LINK@|g s|*THREADS_LINK*|@THREADS_LINK@|g
s|*EXTRA_LINK*|@EXTRA_LINK@|g
s|*WXSTRING*|@WXSTRING@|g s|*WXSTRING*|@WXSTRING@|g
s|*TYPETREE*|@TYPETREE@|g s|*TYPETREE*|@TYPETREE@|g
s|*METAFILE*|@METAFILE@|g s|*METAFILE*|@METAFILE@|g

3
src/common/fileconf.cpp
View File

@@ -1314,6 +1314,9 @@ wxString FilterIn(const wxString& str)
// quote the string before writing it to file // quote the string before writing it to file
wxString FilterOut(const wxString& str) wxString FilterOut(const wxString& str)
{ {
if(str.IsEmpty())
return str;
wxString strResult; wxString strResult;
strResult.Alloc(str.Len()); strResult.Alloc(str.Len());