From 117082d17b73a920f22af12cd55315d1147ccd99 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 Mar 2000 01:12:31 +0000 Subject: [PATCH] 1. fixed memory leak in GAddress 2. fixed memory leak with wxLogStderr in wxBase 3. updated tmake files/makefiles for wxBase with wxSocket under MSW 4. fixed wxSashWindow cursor bug by allowing SetCursor(wxNullCursor) 5. fixed warning in gsock*.c git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6751 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/filelist.txt | 8 +- distrib/msw/tmake/vc6.t | 10 +-- distrib/msw/tmake/vc6base.t | 10 +-- wxBase.dsp | 155 ++++++++++++++++++++++----------- 4 files changed, 118 insertions(+), 65 deletions(-) diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt index 17600d829c..2e07b2cf87 100644 --- a/distrib/msw/tmake/filelist.txt +++ b/distrib/msw/tmake/filelist.txt @@ -205,7 +205,7 @@ zipstrm.cpp C B zstream.cpp C B gsocket.c M S,B -gsockmsw.c M S +gsockmsw.c M S,B accel.cpp M app.cpp M automtn.cpp M O @@ -231,7 +231,7 @@ dcclient.cpp M dcmemory.cpp M dcprint.cpp M dcscreen.cpp M -dde.cpp M +dde.cpp M B dialog.cpp M dialup.cpp M dib.cpp M @@ -572,7 +572,7 @@ dcmemory.h W dcprint.h W dcps.h W dcscreen.h W -dde.h W +dde.h W B debug.h W B defs.h W B dialog.h W @@ -884,7 +884,7 @@ dcclient.h 9 dcmemory.h 9 dcprint.h 9 dcscreen.h 9 -dde.h 9 +dde.h 9 B dialog.h 9 dib.h 9 dibutils.h 9 diff --git a/distrib/msw/tmake/vc6.t b/distrib/msw/tmake/vc6.t index fb73d3dee8..665f35329a 100644 --- a/distrib/msw/tmake/vc6.t +++ b/distrib/msw/tmake/vc6.t @@ -80,8 +80,8 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MT /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=1 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -103,8 +103,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" -D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /Fr /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -132,7 +132,7 @@ SOURCE=.\src\msw\dummy.cpp #$ ExpandGlue("WXGENERICSRCS", "# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\generic\\", "\n# End Source File\n"); #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n"); #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); -#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); +#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); #$ ExpandGlue("WXHTMLSRCS", "# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\html\\", "\n# End Source File\n"); # Begin Source File diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t index dfb732331b..3c40d7c4c4 100644 --- a/distrib/msw/tmake/vc6base.t +++ b/distrib/msw/tmake/vc6base.t @@ -73,8 +73,8 @@ RSC=rc.exe # PROP Output_Dir "BaseRelease" # PROP Intermediate_Dir "BaseRelease" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D _MT /YX /FD /c -# ADD CPP /nologo /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D _MT /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MT /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -96,8 +96,8 @@ LIB32=link.exe -lib # PROP Output_Dir "BaseDebug" # PROP Intermediate_Dir "BaseDebug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /MTd /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D _MT /YX /FD /c -# ADD CPP /nologo /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D _MT /Fr /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -123,7 +123,7 @@ SOURCE=.\src\msw\dummy.cpp #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# End Source File\n"); #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# End Source File\n"); #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); -#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); +#$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); # Begin Source File diff --git a/wxBase.dsp b/wxBase.dsp index dd38e46bd4..4ef0f85a84 100644 --- a/wxBase.dsp +++ b/wxBase.dsp @@ -40,8 +40,8 @@ RSC=rc.exe # PROP Output_Dir "BaseRelease" # PROP Intermediate_Dir "BaseRelease" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD CPP /nologo /MT /W3 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -63,7 +63,7 @@ LIB32=link.exe -lib # PROP Output_Dir "BaseDebug" # PROP Intermediate_Dir "BaseDebug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c +# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c # ADD CPP /nologo /MTd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 @@ -80,6 +80,13 @@ LIB32=link.exe -lib # Name "wxBase - Win32 Release" # Name "wxBase - Win32 Debug" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\src\msw\dummy.cpp +# ADD CPP /Yc"wx/wxprec.h" +# End Source File # Begin Source File SOURCE=.\src\common\appcmn.cpp @@ -102,19 +109,6 @@ SOURCE=.\src\common\datstrm.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\dde.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\msw\dir.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\msw\dummy.cpp -# ADD CPP /Yc"wx/wxprec.h" -# End Source File -# Begin Source File - SOURCE=.\src\common\dynarray.cpp # End Source File # Begin Source File @@ -127,11 +121,6 @@ SOURCE=.\src\common\event.cpp # End Source File # Begin Source File -SOURCE=.\src\common\extended.c -# SUBTRACT CPP /YX /Yc /Yu -# End Source File -# Begin Source File - SOURCE=.\src\common\ffile.cpp # End Source File # Begin Source File @@ -164,11 +153,15 @@ SOURCE=.\src\common\fs_zip.cpp # End Source File # Begin Source File +SOURCE=.\src\common\ftp.cpp +# End Source File +# Begin Source File + SOURCE=.\src\common\hash.cpp # End Source File # Begin Source File -SOURCE=.\src\common\init.cpp +SOURCE=.\src\common\http.cpp # End Source File # Begin Source File @@ -192,18 +185,10 @@ SOURCE=.\src\common\longlong.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\main.cpp -# End Source File -# Begin Source File - SOURCE=.\src\common\mimecmn.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\mimetype.cpp -# End Source File -# Begin Source File - SOURCE=.\src\common\module.cpp # End Source File # Begin Source File @@ -224,11 +209,23 @@ SOURCE=.\src\common\process.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\regconf.cpp +SOURCE=.\src\common\protocol.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\registry.cpp +SOURCE=.\src\common\sckaddr.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\sckfile.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\sckipc.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\sckstrm.cpp # End Source File # Begin Source File @@ -236,6 +233,10 @@ SOURCE=.\src\common\serbase.cpp # End Source File # Begin Source File +SOURCE=.\src\common\socket.cpp +# End Source File +# Begin Source File + SOURCE=.\src\common\strconv.cpp # End Source File # Begin Source File @@ -252,10 +253,6 @@ SOURCE=.\src\common\textfile.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\thread.cpp -# End Source File -# Begin Source File - SOURCE=.\src\common\timercmn.cpp # End Source File # Begin Source File @@ -268,35 +265,99 @@ SOURCE=.\src\common\txtstrm.cpp # End Source File # Begin Source File -SOURCE=.\src\common\unzip.c -# SUBTRACT CPP /YX /Yc /Yu +SOURCE=.\src\common\url.cpp # End Source File # Begin Source File -SOURCE=.\src\msw\utils.cpp +SOURCE=.\src\common\utilscmn.cpp # End Source File # Begin Source File -SOURCE=.\src\common\utilscmn.cpp +SOURCE=.\src\common\variant.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\wfstream.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\wxchar.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\zipstrm.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\zstream.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\common\init.cpp +# End Source File + +# Begin Source File + +SOURCE=.\src\msw\dde.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\dir.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\main.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\mimetype.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\regconf.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\registry.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\thread.cpp +# End Source File +# Begin Source File + +SOURCE=.\src\msw\utils.cpp # End Source File # Begin Source File SOURCE=.\src\msw\utilsexc.cpp # End Source File + # Begin Source File -SOURCE=.\src\common\variant.cpp +SOURCE=.\src\common\extended.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File -SOURCE=.\src\common\wfstream.cpp +SOURCE=.\src\common\unzip.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File + # Begin Source File -SOURCE=.\src\common\wxchar.cpp +SOURCE=.\src\msw\gsocket.c +# SUBTRACT CPP /YX /Yc /Yu # End Source File # Begin Source File +SOURCE=.\src\msw\gsockmsw.c +# SUBTRACT CPP /YX /Yc /Yu +# End Source File + + +# Begin Source File + SOURCE=.\src\common\y_tab.c !IF "$(CFG)" == "wxBase - Win32 Release" @@ -310,14 +371,6 @@ SOURCE=.\src\common\y_tab.c !ENDIF -# End Source File -# Begin Source File - -SOURCE=.\src\common\zipstrm.cpp -# End Source File -# Begin Source File - -SOURCE=.\src\common\zstream.cpp # End Source File # End Target # End Project -- 2.45.2