From 0d3a69ec7039f1c77bb3c23d1bfabb13d5df223f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 12 Mar 2000 15:04:12 +0000 Subject: [PATCH] Added project files for STC; fixed wxStringList memory leaks; small doc changes; git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/src/stc/StcVC.dsp | 222 +++++++++++++++++++++++++++++++ contrib/src/stc/StcVC.dsw | 29 +++++ distrib/msw/generic.rsp | 1 + distrib/msw/stc.rsp | 30 +++++ distrib/msw/vc.rsp | 12 ++ distrib/msw/zipstc.bat | 30 +++++ docs/html/index.htm | 9 +- docs/latex/wx/helpinst.tex | 9 +- docs/latex/wx/hthelpct.tex | 8 +- include/wx/list.h | 2 +- src/common/list.cpp | 1 + src/stc/StcVC.dsp | 222 +++++++++++++++++++++++++++++++ src/stc/StcVC.dsw | 29 +++++ utils/projgen/makeproj.cpp | 258 +++++++++++-------------------------- utils/projgen/makeproj.h | 4 +- 15 files changed, 667 insertions(+), 199 deletions(-) create mode 100644 contrib/src/stc/StcVC.dsp create mode 100644 contrib/src/stc/StcVC.dsw create mode 100644 distrib/msw/stc.rsp create mode 100755 distrib/msw/zipstc.bat create mode 100644 src/stc/StcVC.dsp create mode 100644 src/stc/StcVC.dsw diff --git a/contrib/src/stc/StcVC.dsp b/contrib/src/stc/StcVC.dsp new file mode 100644 index 0000000000..3b8fc6d9e7 --- /dev/null +++ b/contrib/src/stc/StcVC.dsp @@ -0,0 +1,222 @@ +# Microsoft Developer Studio Project File - Name="StcVC" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=StcVC - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "StcVC.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "StcVC.mak" CFG="StcVC - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "StcVC - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "StcVC - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "StcVC - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# 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 /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\lib\stc.lib" + +!ELSEIF "$(CFG)" == "StcVC - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# 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 /MDd /W3 /GX /Z7 /Od /I "../../../include" /I "../../include" /I "scintilla/include" /I "scintilla/src" /D "_DEBUG" /D DEBUG=1 /D "__WXDEBUG__" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D "__WX__" /D "SCI_LEXER" /FD /c +# SUBTRACT CPP /YX +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo /out:"..\..\lib\stcd.lib" + +!ENDIF + +# Begin Target + +# Name "StcVC - Win32 Release" +# Name "StcVC - Win32 Debug" +# Begin Group "Stc" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\PlatWX.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScintillaWX.cpp +# End Source File +# Begin Source File + +SOURCE=.\ScintillaWX.h +# End Source File +# Begin Source File + +SOURCE=.\stc.cpp +# End Source File +# End Group +# Begin Group "Scintilla" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\scintilla\src\Accessor.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\AutoComplete.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\AutoComplete.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\CallTip.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\CallTip.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\CellBuffer.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\CellBuffer.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ContractionState.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ContractionState.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Document.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Document.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Editor.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Editor.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Indicator.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Indicator.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\KeyMap.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\KeyMap.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\KeyWords.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\LineMarker.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\LineMarker.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\PropSet.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ScintillaBase.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ScintillaBase.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Style.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\Style.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\SVector.h +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ViewStyle.cxx +# End Source File +# Begin Source File + +SOURCE=.\scintilla\src\ViewStyle.h +# End Source File +# End Group +# End Target +# End Project diff --git a/contrib/src/stc/StcVC.dsw b/contrib/src/stc/StcVC.dsw new file mode 100644 index 0000000000..b0e6f7d228 --- /dev/null +++ b/contrib/src/stc/StcVC.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "StcVC"=.\StcVC.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index ed0349a7ea..430cecab93 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -967,6 +967,7 @@ samples/statbar/*.rc samples/statbar/*.def samples/statbar/*.ico samples/statbar/*.xpm +samples/statbar/*.bmp samples/statbar/*.txt samples/plot/*.cpp diff --git a/distrib/msw/stc.rsp b/distrib/msw/stc.rsp new file mode 100644 index 0000000000..4b7ce49777 --- /dev/null +++ b/distrib/msw/stc.rsp @@ -0,0 +1,30 @@ +contrib/src/stc/*.cpp +contrib/src/stc/*.h +contrib/src/stc/*.rc +contrib/src/stc/*.def +contrib/src/stc/*.xbm +contrib/src/stc/*.xpm +contrib/src/stc/make*.* +contrib/src/stc/*.txt +contrib/src/stc/*.ico +contrib/src/stc/*.bmp + +contrib/include/wx/stc/*.h + +contrib/samples/stc/*.cpp +contrib/samples/stc/*.h +contrib/samples/stc/*.rc +contrib/samples/stc/*.def +contrib/samples/stc/*.xbm +contrib/samples/stc/make*.* +contrib/samples/stc/Makefile +contrib/samples/stc/*.txt +contrib/samples/stc/*.ico +contrib/samples/stc/*.bmp +contrib/samples/stc/*.xpm +contrib/samples/stc/*.wxr +contrib/samples/stc/bitmaps/*.bmp +contrib/samples/stc/bitmaps/*.gif +contrib/samples/stc/bitmaps/*.xbm +contrib/samples/stc/bitmaps/*.xpm + diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp index acf888ce8b..ac8a3e83a6 100644 --- a/distrib/msw/vc.rsp +++ b/distrib/msw/vc.rsp @@ -178,12 +178,18 @@ samples/sockets/ServerVC.dsw samples/splitter/SplitterVC.dsp samples/splitter/SplitterVC.dsw +samples/statbar/StatbarVC.dsp +samples/statbar/StatbarVC.dsw + samples/tab/TabVC.dsp samples/tab/TabVC.dsw samples/taskbar/TaskbarVC.dsp samples/taskbar/TaskbarVC.dsw +samples/text/TextVC.dsp +samples/text/TextVC.dsw + samples/thread/ThreadVC.dsp samples/thread/ThreadVC.dsw @@ -250,3 +256,9 @@ contrib/src/mmedia/MMediaVC.dsw contrib/samples/mmedia/MmboardVC.dsp contrib/samples/mmedia/MmboardVC.dsw +contrib/src/stc/StcVC.dsp +contrib/src/stc/StcVC.dsw + +contrib/samples/stc/StcTestVC.dsp +contrib/samples/stc/StcTestVC.dsw + diff --git a/distrib/msw/zipstc.bat b/distrib/msw/zipstc.bat new file mode 100755 index 0000000000..e888906fd7 --- /dev/null +++ b/distrib/msw/zipstc.bat @@ -0,0 +1,30 @@ +@echo off +rem Zip up an external distribution of STC (wxStyledTextCtrl) +set src=d:\wx2\wxWindows +set dest=d:\wx2\wxWindows\deliver + +if "%src" == "" goto usage +if "%dest" == "" goto usage +echo About to archive an external STC distribution: +echo From %src +echo To %dest\stc3.zip +echo CTRL-C if this is not correct. +inkey /W4 `Press any key to continue...` %%input + +erase %dest\stc3.zip +cd %src +zip32 -@ %dest\stc3.zip < %src\distrib\msw\stc.rsp + +cd %dest + +echo STC archived. +goto end + +:usage +echo DOS STC distribution. +echo Usage: zipstc source destination +echo e.g. zipstc d:\wx2\wxWindows d:\wx2\wxWindows\deliver + +:end + + diff --git a/docs/html/index.htm b/docs/html/index.htm index 35800afd73..de8a154f92 100644 --- a/docs/html/index.htm +++ b/docs/html/index.htm @@ -182,14 +182,16 @@ using wxMDIParentFrame, wxMDIChildFrame. dynamically.
  • exec: demonstrates wxExecute.
  • font: tests fonts, font enumerator, font encodings. -
  • grid: demonstrates the wxGrid class. +
  • grid: demonstrates the wxGrid class. This demo should work +when the old grid implementation is compiled into wxWindows, and also with the new implementation. +Please see newgrid below for a full demo of the new implementation's capabilities.
  • help: shows how to use wxHelpController.
  • html: a number of demos for the wxHTML class library, used inside applications and also as a help facility.