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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@559 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h
index 57b2dc7374e8c9b98bebbc3831b27124bb191077..d8ee284bf2c4bb4ae84c15a75d20b4f2fe0ae82e 100644 (file)
--- a/include/wx/gtk/window.h
+++ b/include/wx/gtk/window.h
@@ -120,7 +120,7 @@ public:
     { return m_parent; }
   wxWindow *GetGrandParent(void) const
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
     { return m_parent; }
   wxWindow *GetGrandParent(void) const
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }

-  void wxWindow::SetParent( wxWindow *p ) 
+  void SetParent( wxWindow *p ) 

     { m_parent = p; }
 
   wxEvtHandler *GetEventHandler();
     { m_parent = p; }
 
   wxEvtHandler *GetEventHandler();

diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h
index 57b2dc7374e8c9b98bebbc3831b27124bb191077..d8ee284bf2c4bb4ae84c15a75d20b4f2fe0ae82e 100644 (file)
--- a/include/wx/gtk1/window.h
+++ b/include/wx/gtk1/window.h
@@ -120,7 +120,7 @@ public:
     { return m_parent; }
   wxWindow *GetGrandParent(void) const
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }
     { return m_parent; }
   wxWindow *GetGrandParent(void) const
     { return (m_parent ? m_parent->m_parent : (wxWindow*)NULL); }

-  void wxWindow::SetParent( wxWindow *p ) 
+  void SetParent( wxWindow *p ) 

     { m_parent = p; }
 
   wxEvtHandler *GetEventHandler();
     { m_parent = p; }
 
   wxEvtHandler *GetEventHandler();

diff --git a/install/unix/configure.in b/install/unix/configure.in
index b1e0a7c6a2d6c3893d3927d8d75db92849732cb7..734d131b0b861567d4118b8bdff2d0d2702286d4 100644 (file)
--- a/install/unix/configure.in
+++ b/install/unix/configure.in
@@ -654,6 +654,7 @@ DEFAULT_USE_PROFILE=0
 DEFAULT_USE_DEBUG_FLAG=0
 DEFAULT_USE_DEBUG_INFO=0
 DEFAULT_USE_MEM_TRACING=0
 DEFAULT_USE_DEBUG_FLAG=0
 DEFAULT_USE_DEBUG_INFO=0
 DEFAULT_USE_MEM_TRACING=0

+DEFAULT_USE_DMALLOC=0

 
 DEFAULT_USE_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1
 
 DEFAULT_USE_ZLIB=1
 DEFAULT_USE_GDK_IMLIB=1


@@ -736,6 +737,10 @@ AC_OVERRIDES(mem_tracing,mem_tracing,
 **--with-mem_traing       create code with memory tracing,
 USE_MEM_TRACING)
 
 **--with-mem_traing       create code with memory 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,
 **--with-profile          create code with profiling information included,
 USE_PROFILE)
 AC_OVERRIDES(profile,profile,
 **--with-profile          create code with profiling information included,
 USE_PROFILE)


@@ -1042,6 +1047,12 @@ if test "$USE_MEM_TRACING" = 1 ; then
   dnl AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
 fi
 
   dnl AC_DEFINE_UNQUOTED(USE_GLOBAL_MEMORY_OPERATORS,$USE_MEM_TRACING)
 fi
 

+EXTRA_LINK=
+if test "$USE_DMALLOC" = 1 ; then
+  EXTRA_LINK="$EXTRA_LINK -ldmalloc"
+fi
+AC_SUBST(EXTRA_LINK)
+

 PROFILE=
 if test "$USE_PROFILE" = 1 ; then
   PROFILE="-pg"
 PROFILE=
 if test "$USE_PROFILE" = 1 ; then
   PROFILE="-pg"

diff --git a/install/unix/setup/maketmpl.in b/install/unix/setup/maketmpl.in
index f259fb117589b0318659b4688cd3bd1cd42620bd..25051c1affc0b6be5bdb942993411b5d98dcd2ee 100644 (file)
--- a/install/unix/setup/maketmpl.in
+++ b/install/unix/setup/maketmpl.in
@@ -88,6 +88,7 @@ OPENGL_LIBRARY = @OPENGL_LIBRARY@
 OPENGL_LINK = @OPENGL_LINK@
 
 THREADS_LINK = @THREADS_LINK@
 OPENGL_LINK = @OPENGL_LINK@
 
 THREADS_LINK = @THREADS_LINK@

+EXTRA_LINK = @EXTRA_LINK@

 
 # INCLUDES
 WX_INCLUDES = \
 
 # INCLUDES
 WX_INCLUDES = \


@@ -116,7 +117,8 @@ LINK_LIBS= \
   $(GUI_TK_LIBS) \
   $(X_EXTRA_LIBS) \
   $(X_PRE_LIBS) \
   $(GUI_TK_LIBS) \
   $(X_EXTRA_LIBS) \
   $(X_PRE_LIBS) \

-  $(THREADS_LINK)
+  $(THREADS_LINK) \
+  $(EXTRA_LINK)

   
 # Don't include $(OPENGL_LIBS) in LINK_LIBS; they
 # can be conveniently added to BIN_LINK in Makefile.in.
   
 # Don't include $(OPENGL_LIBS) in LINK_LIBS; they
 # can be conveniently added to BIN_LINK in Makefile.in.

diff --git a/install/unix/setup/substit.in b/install/unix/setup/substit.in
index 58ca011be4c2ac9367a08b70e1a4a5a6dd7dec60..ede3bf15980e1366fcf6b380fecbea5c17ffda3d 100644 (file)
--- a/install/unix/setup/substit.in
+++ b/install/unix/setup/substit.in
@@ -43,6 +43,7 @@ s|*TOOLKIT*|@TOOLKIT@|g
 s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
 s|*THREADS*|@THREADS@|g
 s|*THREADS_LINK*|@THREADS_LINK@|g
 s|*TOOLKIT_DEF*|@TOOLKIT_DEF@|g
 s|*THREADS*|@THREADS@|g
 s|*THREADS_LINK*|@THREADS_LINK@|g

+s|*EXTRA_LINK*|@EXTRA_LINK@|g

 s|*WXSTRING*|@WXSTRING@|g
 s|*TYPETREE*|@TYPETREE@|g
 s|*METAFILE*|@METAFILE@|g
 s|*WXSTRING*|@WXSTRING@|g
 s|*TYPETREE*|@TYPETREE@|g
 s|*METAFILE*|@METAFILE@|g

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 655cd217db3cb44baec93f43eb55b114ffc543cd..5688b9aa41be50a987ebc390f5eefb3e6d9f8d67 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1314,6 +1314,9 @@ wxString FilterIn(const wxString& str)
 // quote the string before writing it to file
 wxString FilterOut(const wxString& str)
 {
 // quote the string before writing it to file
 wxString FilterOut(const wxString& str)
 {

+   if(str.IsEmpty())
+      return str;
+   

   wxString strResult;
   strResult.Alloc(str.Len());
 
   wxString strResult;
   strResult.Alloc(str.Len());