Fixed memory leak in textcmn.cpp

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

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 5a2143aa718b985d29609e9b44e15b66ec981fac..9eef2b90ce1a2a226166695c997587f52de92c6e 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -99,6 +99,8 @@ OLEDIR=ole
 MSWDIR=$(WXDIR)\src\msw
 DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
+JPEGDIR = $(WXDIR)\src\jpeg
+TIFFDIR = $(WXDIR)\src\tiff
 
 {..\generic}.cpp{..\generic\$D}.obj:
        cl @<<
@@ -162,7 +164,7 @@ setuph:
     if not exist setup.h copy setup0.h setup.h
     cd $(WXDIR)\src\msw
 
-dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
+dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D $(JPEGDIR)\$D $(TIFFDIR)\$D
 
 $D:
     mkdir $D
@@ -182,6 +184,12 @@ $(OLEDIR)\$D:
 $(HTMLDIR)\$D:
     mkdir $(HTMLDIR)\$D
 
+$(JPEGDIR)\$D:
+    mkdir $(JPEGDIR)\$D
+
+$(TIFFDIR)\$D:
+    mkdir $(TIFFDIR)\$D
+
 # wxWindows library as DLL
 dll:
         nmake -f makefile.vc all FINAL=$(FINAL) DLL=1 WXMAKINGDLL=1 NEW_WXLIBNAME=$(NEW_WXLIBNAME)
@@ -424,17 +432,29 @@ clean: $(PERIPH_CLEAN_TARGET)
         -erase $(MSWDIR)\$D\*.obj
         -erase $(MSWDIR)\$D\*.sbr
         -erase $(MSWDIR)\$D\*.pdb
+        -erase $(MSWDIR)\$D\*.pch
         -erase $(OLEDIR)\$D\*.obj
         -erase $(OLEDIR)\$D\*.sbr
         -erase $(OLEDIR)\$D\*.pdb
         -erase $(HTMLDIR)\$D\*.obj
         -erase $(HTMLDIR)\$D\*.sbr
         -erase $(HTMLDIR)\$D\*.pdb
+        -erase $(JPEGDIR)\$D\*.obj
+        -erase $(JPEGDIR)\$D\*.sbr
+        -erase $(JPEGDIR)\$D\*.idb
+        -erase $(JPEGDIR)\$D\*.pdb
+        -erase $(TIFFDIR)\$D\*.obj
+        -erase $(TIFFDIR)\$D\*.sbr
+        -erase $(TIFFDIR)\$D\*.pdb
+        -erase $(TIFFDIR)\$D\*.idb
         -rmdir $(D)
-        -rmdir ole\$(D)
-        -rmdir ..\generic\$(D)
-        -rmdir ..\common\$(D)
-        -rmdir ..\html\$(D)
+        -rmdir $(GENDIR)\$(D)
+        -rmdir $(COMMDIR)\$(D)
+        -rmdir $(MSWDIR)\$(D)
+        -rmdir $(OLEDIR)\$(D)
+        -rmdir $(HTMLDIR)\$(D)
+        -rmdir $(JPEGDIR)\$(D)
+        -rmdir $(TIFFDIR)\$(D)
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf allhtb allhtmlhelp

diff --git a/distrib/msw/zipmac.bat b/distrib/msw/zipmac.bat
index 2c849d63b72530b3cd0fab062083621fdc30f798..2d1863583447371b89a632c6e626a41aa84a738a 100755 (executable)
--- a/distrib/msw/zipmac.bat
+++ b/distrib/msw/zipmac.bat
@@ -5,7 +5,7 @@ set src=%wxwin%
 set dest=%src%\deliver
 
 Rem Set this to the required version
-set version=2.3.0
+set version=2.3.1
 
 if "%src%" == "" goto usage
 if "%dest%" == "" goto usage
@@ -25,6 +25,7 @@ echo Zipping...
 
 zip -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\generic.rsp
 zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\mac.rsp
+zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\makefile.rsp
 zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\cw.rsp
 zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\tiff.rsp
 zip -u -@ %dest%\wxMac-%version%.zip < %src%\distrib\msw\jpeg.rsp

diff --git a/src/common/textcmn.cpp b/src/common/textcmn.cpp
index 1686e5c91ee83841bcc09ddb9c433fcac53ec78c..4d0f086530ab00baa677d090fa410531536e42b2 100644 (file)
--- a/src/common/textcmn.cpp
+++ b/src/common/textcmn.cpp
@@ -64,7 +64,7 @@ wxTextCtrlBase::~wxTextCtrlBase()
 {
 #ifndef NO_TEXT_WINDOW_STREAM
 #if !wxUSE_IOSTREAMH
-  delete m_streambuf;
+  delete[] m_streambuf;
 #endif
 #endif
 }

diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index 035361aaaceea7f1566d075bd13c736b4a456dd6..ae3453a6f1baf6aa3317f5e0dbfa6b6ef75da5d0 100644 (file)
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -273,8 +273,8 @@ wxLongLong wxGetLocalTimeMillis()
 {
     wxLongLong val = 1000l;
 
-    // If possible, use a functin which avoids conversions from
-    // broken-up time structures to milliseconds,
+    // If possible, use a function which avoids conversions from
+    // broken-up time structures to milliseconds
 
 #if defined(HAVE_GETTIMEOFDAY)
     struct timeval tp;

diff --git a/src/makeprog.vc b/src/makeprog.vc
index f33a3f4ad1be1a4947a0248b2ece50fc15b21dde..3559c1ca82c4efd177a5b330ac98291bf2d624dd 100644 (file)
--- a/src/makeprog.vc
+++ b/src/makeprog.vc
@@ -38,7 +38,11 @@ wxclean:
 wxUSE_GUI=1
 !endif
 
-!if "$(wxUSE_GUI)" == "1" 
+!if "$(wxUSE_GUI)" == "1"
+
+#!if "$(WXUSINGDLL)" == "1"
+#DUMMYOBJ=
+#!endif
 
 $(PROGRAM).exe:      $(WXLIB) $(OBJECTS) $(PROGRAM).res
        $(link) @<<