Fixed memory leak in textcmn.cpp

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2001-06-06 11:17:30 +00:00
parent fae5c45283
commit 9e3cb9eefc
5 changed files with 35 additions and 10 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -64,7 +64,7 @@ wxTextCtrlBase::~wxTextCtrlBase()
{
#ifndef NO_TEXT_WINDOW_STREAM
#if !wxUSE_IOSTREAMH
delete m_streambuf;
delete[] m_streambuf;
#endif
#endif
}

View File

@@ -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;

View File

@@ -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) @<<