From 5d525ad91103edf067939f6b0a03fbb45155cf34 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 14 Mar 2000 15:18:20 +0000 Subject: [PATCH] Doc edits; adding mmedia.rsp; added STC BC++ makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6693 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/docs/latex/mmedia/cdaudio.tex | 10 +-- contrib/docs/latex/mmedia/cdaudlnx.tex | 7 --- contrib/docs/latex/mmedia/cdaudwin.tex | 11 ++-- contrib/docs/latex/mmedia/cdtoc.tex | 7 --- contrib/docs/latex/mmedia/classes.tex | 4 +- contrib/docs/latex/mmedia/mmedia.tex | 6 +- contrib/docs/latex/mmedia/ogl.hpj | 17 ----- contrib/docs/latex/mmedia/ogledit.bmp | Bin 87670 -> 0 bytes contrib/docs/latex/mmedia/ogledit.gif | Bin 7163 -> 0 bytes contrib/docs/latex/mmedia/sample.tex | 5 +- contrib/docs/latex/mmedia/sndbase.tex | 16 +++-- contrib/docs/latex/mmedia/tex2rtf.ini | 5 +- contrib/docs/latex/mmedia/topics.tex | 4 +- contrib/docs/latex/mmedia/vidbase.tex | 2 +- contrib/docs/latex/mmedia/vidwin.tex | 3 +- contrib/samples/stc/makefile.b32 | 18 ++++++ contrib/src/stc/makefile.b32 | 79 ++++++++++++++++++++++++ contrib/src/stc/scintilla/src/SVector.h | 6 +- distrib/msw/docsrc.rsp | 33 ---------- distrib/msw/generic.rsp | 16 ----- distrib/msw/mmedia.rsp | 40 ++++++++++++ distrib/msw/ogl.rsp | 23 +++++++ distrib/msw/stc.rsp | 33 ++++++++-- distrib/msw/zipdist.bat | 3 + docs/msw/install.txt | 4 +- docs/readme.txt | 2 +- samples/stc/makefile.b32 | 18 ++++++ src/stc/makefile.b32 | 79 ++++++++++++++++++++++++ src/stc/scintilla/src/SVector.h | 6 +- 29 files changed, 337 insertions(+), 120 deletions(-) delete mode 100644 contrib/docs/latex/mmedia/ogl.hpj delete mode 100644 contrib/docs/latex/mmedia/ogledit.bmp delete mode 100644 contrib/docs/latex/mmedia/ogledit.gif create mode 100644 contrib/samples/stc/makefile.b32 create mode 100644 contrib/src/stc/makefile.b32 create mode 100644 distrib/msw/mmedia.rsp create mode 100644 samples/stc/makefile.b32 create mode 100644 src/stc/makefile.b32 diff --git a/contrib/docs/latex/mmedia/cdaudio.tex b/contrib/docs/latex/mmedia/cdaudio.tex index 65d06f80f4..bbacbbf225 100644 --- a/contrib/docs/latex/mmedia/cdaudio.tex +++ b/contrib/docs/latex/mmedia/cdaudio.tex @@ -3,19 +3,21 @@ % /home/guilhem/PROJECTS/wxWindows/utils/wxMMedia2/lib/cdbase.h at 26/Feb/00 14:52:12 % - \section{\class{wxCDAudio}}\label{wxcdaudio} \wxheading{Derived from} -\helpref{wxObject}{wxobject} +wxObject \wxheading{Data structures} -{\small \begin{verbatim} +{\small +\begin{verbatim} typedef struct wxCDtime { wxUint8 track -\end{verbatim}} +}; +\end{verbatim} +} {\small \begin{verbatim} typedef enum { PLAYING, PAUSED, STOPPED } CDstatus \end{verbatim}} diff --git a/contrib/docs/latex/mmedia/cdaudlnx.tex b/contrib/docs/latex/mmedia/cdaudlnx.tex index 286116b229..9dcdb4f699 100644 --- a/contrib/docs/latex/mmedia/cdaudlnx.tex +++ b/contrib/docs/latex/mmedia/cdaudlnx.tex @@ -6,8 +6,6 @@ \section{\class{wxCDAudioLinux}}\label{wxcdaudiolinux} - - \wxheading{Derived from} \helpref{wxCDAudio}{wxcdaudio} @@ -16,17 +14,12 @@ \latexignore{\rtfignore{\wxheading{Members}}} - \membersection{wxCDAudioLinux::wxCDAudioLinux}\label{wxcdaudiolinuxwxcdaudiolinux} \func{}{wxCDAudioLinux}{\void} - -\membersection{wxCDAudioLinux::wxCDAudioLinux}\label{wxcdaudiolinuxwxcdaudiolinux} - \func{}{wxCDAudioLinux}{\param{const char* }{dev\_name}} - \membersection{wxCDAudioLinux::\destruct{wxCDAudioLinux}}\label{wxcdaudiolinuxdtor} \func{}{\destruct{wxCDAudioLinux}}{\void} diff --git a/contrib/docs/latex/mmedia/cdaudwin.tex b/contrib/docs/latex/mmedia/cdaudwin.tex index 81e2219a14..0d560cbdea 100644 --- a/contrib/docs/latex/mmedia/cdaudwin.tex +++ b/contrib/docs/latex/mmedia/cdaudwin.tex @@ -14,10 +14,14 @@ \wxheading{Data structures} -{\small \begin{verbatim} +{\small +\begin{verbatim} typedef struct CDAW\_Internal { MCIDEVICEID dev\_id -\end{verbatim}} +}; +\end{verbatim} +} + \latexignore{\rtfignore{\wxheading{Members}}} @@ -25,9 +29,6 @@ typedef struct CDAW\_Internal { \func{}{wxCDAudioWin}{\void} - -\membersection{wxCDAudioWin::wxCDAudioWin}\label{wxcdaudiowinwxcdaudiowin} - \func{}{wxCDAudioWin}{\param{const char* }{dev\_name}} diff --git a/contrib/docs/latex/mmedia/cdtoc.tex b/contrib/docs/latex/mmedia/cdtoc.tex index 465c495c33..1e60972d96 100644 --- a/contrib/docs/latex/mmedia/cdtoc.tex +++ b/contrib/docs/latex/mmedia/cdtoc.tex @@ -17,7 +17,6 @@ No base class \latexignore{\rtfignore{\wxheading{Members}}} - \membersection{CDtoc::CDtoc}\label{cdtoccdtoc} \func{}{CDtoc}{\param{wxCDtime\& }{tot\_tm}, \param{wxCDtime* }{trks\_tm}, \param{wxCDtime* }{trks\_pos}} @@ -62,16 +61,10 @@ Returns the total time Play audio at the specified position - -\membersection{wxCDAudio::Play}\label{wxcdaudioplay} - \func{bool}{Play}{\param{const wxCDtime\& }{beg\_play}} Play audio from the specified to the end of the CD audio - -\membersection{wxCDAudio::Play}\label{wxcdaudioplay} - \func{bool}{Play}{\param{wxUint8 }{beg\_track}, \param{wxUint8 }{end\_track = 0}} diff --git a/contrib/docs/latex/mmedia/classes.tex b/contrib/docs/latex/mmedia/classes.tex index 7db6ab8899..8a19c33023 100644 --- a/contrib/docs/latex/mmedia/classes.tex +++ b/contrib/docs/latex/mmedia/classes.tex @@ -1,8 +1,8 @@ -chapter{Class reference}\label{classref} +\chapter{Class reference}\label{classref} \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}% \setfooter{\thepage}{}{}{}{}{\thepage} -These are the main mmedia classes. +These are the main Mmedia classes. \input cdaudio.tex \input cdaudlnx.tex diff --git a/contrib/docs/latex/mmedia/mmedia.tex b/contrib/docs/latex/mmedia/mmedia.tex index 5d74196e7a..54d2c30bdc 100644 --- a/contrib/docs/latex/mmedia/mmedia.tex +++ b/contrib/docs/latex/mmedia/mmedia.tex @@ -10,9 +10,9 @@ \input psbox.tex \parindent 0pt \parskip 11pt -\title{Object Graphics Library 3.0} -\author{Julian Smart} -\date{September 1998} +\title{MMedia for wxWindows} +\author{Guilhem Lavaux} +\date{March 2000} \makeindex \begin{document} diff --git a/contrib/docs/latex/mmedia/ogl.hpj b/contrib/docs/latex/mmedia/ogl.hpj deleted file mode 100644 index 5db5ace6f0..0000000000 --- a/contrib/docs/latex/mmedia/ogl.hpj +++ /dev/null @@ -1,17 +0,0 @@ -[OPTIONS] -BMROOT=d:\wx2\wxwind~1\docs\latex\ogl ; Assume that bitmaps are where the source is -TITLE=OGL Manual -CONTENTS=Contents -COMPRESS=HIGH - -[FILES] -ogl.rtf - -[CONFIG] -CreateButton("Up", "&Up", "JumpId(`ogl.hlp', `Contents')") -BrowseButtons() - -[MAP] - -[BITMAPS] - diff --git a/contrib/docs/latex/mmedia/ogledit.bmp b/contrib/docs/latex/mmedia/ogledit.bmp deleted file mode 100644 index e7cf417cf5d40022505909a5653ac5f30b6aa6e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 87670 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 vE@(YAD`u@xxel-F=j7V|6876La_!vgyq7z diff --git a/contrib/docs/latex/mmedia/ogledit.gif b/contrib/docs/latex/mmedia/ogledit.gif deleted file mode 100644 index 9784681b2d44f95979f6b95e5b699f94e115e85a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7163 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 diff --git a/contrib/docs/latex/mmedia/sample.tex b/contrib/docs/latex/mmedia/sample.tex index 1bf55b7679..8b8e65c0af 100644 --- a/contrib/docs/latex/mmedia/sample.tex +++ b/contrib/docs/latex/mmedia/sample.tex @@ -1,3 +1,6 @@ -\chapter{OGLEdit: a sample OGL application}\label{ogledit}% +\chapter{MMboard: a sample MMedia application}\label{mmboard}% \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}% \setfooter{\thepage}{}{}{}{}{\thepage} + +To be written. + diff --git a/contrib/docs/latex/mmedia/sndbase.tex b/contrib/docs/latex/mmedia/sndbase.tex index 73e9ab84b9..bc719ba1d9 100644 --- a/contrib/docs/latex/mmedia/sndbase.tex +++ b/contrib/docs/latex/mmedia/sndbase.tex @@ -205,10 +205,9 @@ It specifies the sound format the user needs. SetSoundFormat tries to apply the format to the current sound stream (it can be a sound file or a sound driver). Then, either it manages to apply it and it returns {\bf TRUE}, or it could not and it returns {\bf FALSE}. In this case, you must check -the error with -\helpref{wxSoundStream::GetError}{wxsoundstreamgeterror}. See -\helpref{wxSoundStream errors section}{wxsoundstreamerrors} for more details. - +the error with +\helpref{wxSoundStream::GetError}{wxsoundstreamgeterror}. See +\helpref{wxSoundStream errors section}{wxsoundstream} for more details. \wxheading{Note} @@ -248,7 +247,7 @@ Each callback has its callback data. \func{bool}{StartProduction}{\param{int }{evt}} -StartProduction starts the sound streaming. {\it evt} may be one of +StartProduction starts the sound streaming. {\it evt} may be one of {\bf wxSOUND\_INPUT}, {\bf wxSOUND\_OUTPUT} or {\bf wxSOUND\_DUPLEX}. You cannot specify several flags at the same time. Starting the production may automaticaly in position of buffer underrun (only in the case you activated @@ -257,32 +256,39 @@ It is also advised that you fill quickly enough the sound IO queue when the driver requests it (through a wxSoundEvent). \membersection{wxSoundStream::StopProduction}\label{wxsoundstreamstopproduction} + \func{bool}{StopProduction}{\void} I stops the async notifier and the sound streaming straightly. \membersection{wxSoundStream::SetEventHandler}\label{wxsoundstreamseteventhandler} + \func{void}{SetEventHandler}{\param{wxSoundStream* }{handler}} Sets the event handler: if it is non-null, all events are routed to it. \membersection{wxSoundStream::GetError}\label{wxsoundstreamgeterror} + \constfunc{wxSoundError}{GetError}{\void} It returns the last error which occured. \membersection{wxSoundStream::GetLastAccess}\label{wxsoundstreamgetlastaccess} + \constfunc{wxUint32}{GetLastAccess}{\void} It returns the number of bytes which were effectively written to/read from the sound stream. \membersection{wxSoundStream::QueueFilled}\label{wxsoundstreamqueuefilled} + \constfunc{bool}{QueueFilled}{\void} It returns whether the sound IO queue is full. When it is full, the next IO call will block until the IO queue has at least one empty entry. \membersection{wxSoundStream::OnSoundEvent}\label{wxsoundstreamonsoundevent} + \func{void}{OnSoundEvent}{\param{int }{evt}} It is called by the wxSoundStream when a new sound event occured. + diff --git a/contrib/docs/latex/mmedia/tex2rtf.ini b/contrib/docs/latex/mmedia/tex2rtf.ini index 41dd2cffa3..d261135eed 100644 --- a/contrib/docs/latex/mmedia/tex2rtf.ini +++ b/contrib/docs/latex/mmedia/tex2rtf.ini @@ -1,4 +1,3 @@ -; Last change: JS 8 Sep 98 2:54 pm runTwice = yes titleFontSize = 12 authorFontSize = 10 @@ -9,11 +8,11 @@ headerRule = yes footerRule = yes useHeadingStyles = yes listItemIndent=40 -generateHPJ = no +generateHPJ = yes htmlBrowseButtons = bitmap winHelpVersion = 3 winHelpContents = yes -winHelpTitle = "OGL Manual" +winHelpTitle = "MMedia Manual" truncateFilenames = yes combineSubSections = yes \overview [2] {\rtfonly{See also }\settransparency{on}\sethotspotcolour{off}\sethotspotunderline{on}\winhelponly{\image{}{books.bmp}\settransparency{off}} diff --git a/contrib/docs/latex/mmedia/topics.tex b/contrib/docs/latex/mmedia/topics.tex index 6ac8da4069..02159265ed 100644 --- a/contrib/docs/latex/mmedia/topics.tex +++ b/contrib/docs/latex/mmedia/topics.tex @@ -1,4 +1,4 @@ -\chapter{Topic overviews} +\chapter{Topic overviews}\label{overviews} \setheader{{\it CHAPTER \thechapter}}{}{}{}{}{{\it CHAPTER \thechapter}}% \setfooter{\thepage}{}{}{}{}{\thepage} @@ -6,3 +6,5 @@ The following sections describe particular topics. \section{MMedia extension overview}\label{mmedoverview} +To be written. + diff --git a/contrib/docs/latex/mmedia/vidbase.tex b/contrib/docs/latex/mmedia/vidbase.tex index 09b7744412..38ece531c2 100644 --- a/contrib/docs/latex/mmedia/vidbase.tex +++ b/contrib/docs/latex/mmedia/vidbase.tex @@ -9,7 +9,7 @@ Classes definition \wxheading{Derived from} -\helpref{wxObject}{wxobject} +wxObject \wxheading{Data structures} diff --git a/contrib/docs/latex/mmedia/vidwin.tex b/contrib/docs/latex/mmedia/vidwin.tex index a2672b4062..9aad585f28 100644 --- a/contrib/docs/latex/mmedia/vidwin.tex +++ b/contrib/docs/latex/mmedia/vidwin.tex @@ -19,9 +19,10 @@ Class definition {\small \begin{verbatim} typedef struct VIDW\_Internal { MCIDEVICEID m\_dev\_id +}; \end{verbatim}} -\latexignore{\rtfignore{\wxheading{Members}}} +\latexignore{\rtfignore{\wxheading{Members}}} \membersection{wxVideoWindows::OpenFile}\label{wxvideowindowsopenfile} diff --git a/contrib/samples/stc/makefile.b32 b/contrib/samples/stc/makefile.b32 new file mode 100644 index 0000000000..ae489f3a7d --- /dev/null +++ b/contrib/samples/stc/makefile.b32 @@ -0,0 +1,18 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds sample for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=stctest + +EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/contrib/src/stc/makefile.b32 b/contrib/src/stc/makefile.b32 new file mode 100644 index 0000000000..3d52701553 --- /dev/null +++ b/contrib/src/stc/makefile.b32 @@ -0,0 +1,79 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds wxMMedia library for 32-bit BC++ + +# N.B. use: +# make -f makefile.b32 stc.cfg +# make -f makefile.b32 + +WXDIR = $(WXWIN) + +SCINTILLA=.\scintilla +S=$(SCINTILLA)\src + +STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) + +LIBTARGET=$(WXDIR)\contrib\lib\stc.lib + +OBJECTS = \ + Accessor.obj \ + AutoComplete.obj \ + CallTip.obj \ + CellBuffer.obj \ + ContractionState.obj\ + Document.obj \ + Editor.obj \ + Indicator.obj \ + KeyMap.obj \ + KeyWords.obj \ + LineMarker.obj \ + PropSet.obj \ + ScintillaBase.obj \ + Style.obj \ + ViewStyle.obj \ + \ + PlatWX.obj \ + ScintillaWX.obj \ + stc.obj \ + +!include $(WXDIR)\src\makelib.b32 + +CFG = stc.cfg +CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) + +{$(S)}.cxx.obj: + bcc32 $(CPPFLAGS) -P -c {$< } + +$(CFG): makefile.b32 + copy &&! +-H=$(WXDIR)\src\msw\wx32.csm +-3 +-d +-a1 # byte alignment +-R- +-X +-w-par +-w-aus +-w-hid # virtual function A hides virtual function B +-WE +-tWM + +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff +-I$(WXDIR)\include\wx\msw\gnuwin32 + +-L$(BCCDIR)\lib +-D__WXWIN__ +-D__WXMSW__ +-D__WINDOWS__ +-DWIN32 +$(OPT) +$(DEBUG_FLAGS) +$(WIN95FLAG) +$(STCEXTRACPPFLAGS) +! $(CFG) + diff --git a/contrib/src/stc/scintilla/src/SVector.h b/contrib/src/stc/scintilla/src/SVector.h index 7bc948738a..49fc376dda 100644 --- a/contrib/src/stc/scintilla/src/SVector.h +++ b/contrib/src/stc/scintilla/src/SVector.h @@ -95,9 +95,9 @@ public: len = 0; } void SetLength(int newLen) { - if (newLength > len) { - if (newLength >= size) { - SizeTo(newLength); + if (newLen > len) { + if (newLen >= size) { + SizeTo(newLen); } } len = newLen; diff --git a/distrib/msw/docsrc.rsp b/distrib/msw/docsrc.rsp index f988fd7c47..5e4f4911a6 100644 --- a/distrib/msw/docsrc.rsp +++ b/distrib/msw/docsrc.rsp @@ -21,39 +21,6 @@ utils/tex2rtf/docs/*.shg utils/tex2rtf/docs/*.wmf utils/tex2rtf/docs/*.gif -utils/wxtree/docs/*.tex -utils/wxtree/docs/*.ini -utils/wxtree/docs/*.bib -utils/wxtree/docs/*.txt -utils/wxtree/docs/*.hpj -utils/wxtree/docs/*.bmp -utils/wxtree/docs/*.wmf -utils/wxtree/docs/*.gif - -utils/wxgraph/docs/*.tex -utils/wxgraph/docs/*.ini -utils/wxgraph/docs/*.bib -utils/wxgraph/docs/*.txt -utils/wxgraph/docs/*.hpj -utils/wxgraph/docs/*.bmp -utils/wxgraph/docs/*.wmf -utils/wxgraph/docs/*.gif - -utils/mfutils/docs/*.tex -utils/mfutils/docs/*.txt -utils/mfutils/docs/*.hpj -utils/mfutils/docs/*.wmf -utils/mfutils/docs/*.bmp - -utils/wxprop/docs/*.txt -utils/wxprop/docs/*.hpj -utils/wxprop/docs/*.tex -utils/wxprop/docs/*.ini -utils/wxprop/docs/*.eps -utils/wxprop/docs/*.bmp -utils/wxprop/docs/*.wmf -utils/wxprop/docs/*.gif - utils/dialoged/docs/*.txt utils/dialoged/docs/*.hpj utils/dialoged/docs/*.tex diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 430cecab93..56836e991b 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -193,22 +193,6 @@ contrib/configure contrib/configure.in contrib/lib/dummy -contrib/include/wx/mmedia/*.h -contrib/include/wx/mmedia/internal/*.h -contrib/src/mmedia/makefile* -contrib/src/mmedia/README -contrib/src/mmedia/*.h -contrib/src/mmedia/*.cpp -contrib/samples/mmedia/*.h -contrib/samples/mmedia/*.cpp -contrib/samples/mmedia/makefile* -contrib/samples/mmedia/*.xbm -contrib/samples/mmedia/*.xpm -contrib/samples/mmedia/*.ico -contrib/samples/mmedia/*.txt -contrib/samples/mmedia/*.rc -contrib/samples/mmedia/*.def - samples/*.txt samples/makefile* samples/configure diff --git a/distrib/msw/mmedia.rsp b/distrib/msw/mmedia.rsp new file mode 100644 index 0000000000..8ca494f1bc --- /dev/null +++ b/distrib/msw/mmedia.rsp @@ -0,0 +1,40 @@ +contrib/docs/html/mmedia/*.htm +contrib/docs/html/mmedia/*.gif +contrib/docs/html/mmedia/*.png +contrib/docs/winhelp/mmedia.hlp +contrib/docs/winhelp/mmedia.cnt +contrib/docs/pdf/mmedia.pdf + +contrib/docs/latex/mmedia/*.tex +contrib/docs/latex/mmedia/*.sty +contrib/docs/latex/mmedia/*.bib +contrib/docs/latex/mmedia/*.hpj +contrib/docs/latex/mmedia/*.ini +contrib/docs/latex/mmedia/*.txt +contrib/docs/latex/mmedia/*.cnt +contrib/docs/latex/mmedia/*.eps +contrib/docs/latex/mmedia/*.bmp +contrib/docs/latex/mmedia/*.gif +contrib/docs/latex/mmedia/*.wmf + +contrib/include/wx/mmedia/*.h +contrib/include/wx/mmedia/internal/*.h +contrib/src/mmedia/makefile* +contrib/src/mmedia/README +contrib/src/mmedia/*.h +contrib/src/mmedia/*.cpp +contrib/src/mmedia/MMediaVC.dsp +contrib/src/mmedia/MMediaVC.dsw +contrib/samples/mmedia/MMBoardVC.dsw +contrib/samples/mmedia/*.h +contrib/samples/mmedia/*.cpp +contrib/samples/mmedia/makefile* +contrib/samples/mmedia/*.xbm +contrib/samples/mmedia/*.xpm +contrib/samples/mmedia/*.ico +contrib/samples/mmedia/*.txt +contrib/samples/mmedia/*.rc +contrib/samples/mmedia/*.def +contrib/samples/mmedia/MMBoardVC.dsp +contrib/samples/mmedia/MMBoardVC.dsw + diff --git a/distrib/msw/ogl.rsp b/distrib/msw/ogl.rsp index 3f16da6a2d..e9d11d0e62 100644 --- a/distrib/msw/ogl.rsp +++ b/distrib/msw/ogl.rsp @@ -1,3 +1,22 @@ +contrib/docs/html/ogl/*.htm +contrib/docs/html/ogl/*.gif +contrib/docs/html/ogl/*.png +contrib/docs/winhelp/ogl.hlp +contrib/docs/winhelp/ogl.cnt +contrib/docs/pdf/ogl.pdf + +contrib/docs/latex/ogl/*.tex +contrib/docs/latex/ogl/*.sty +contrib/docs/latex/ogl/*.bib +contrib/docs/latex/ogl/*.hpj +contrib/docs/latex/ogl/*.ini +contrib/docs/latex/ogl/*.txt +contrib/docs/latex/ogl/*.cnt +contrib/docs/latex/ogl/*.eps +contrib/docs/latex/ogl/*.bmp +contrib/docs/latex/ogl/*.gif +contrib/docs/latex/ogl/*.wmf + contrib/src/ogl/*.cpp contrib/src/ogl/*.h contrib/src/ogl/*.rc @@ -22,6 +41,8 @@ contrib/samples/ogl/ogledit/*.txt contrib/samples/ogl/ogledit/*.ico contrib/samples/ogl/ogledit/*.bmp contrib/samples/ogl/ogledit/*.xpm +contrib/samples/ogl/ogledit/OGLEditVC.dsp +contrib/samples/ogl/ogledit/OGLEditVC.dsw contrib/samples/ogl/ogledit/bitmaps/*.bmp contrib/samples/ogl/ogledit/bitmaps/*.gif contrib/samples/ogl/ogledit/bitmaps/*.xbm @@ -39,6 +60,8 @@ contrib/samples/ogl/studio/*.ico contrib/samples/ogl/studio/*.bmp contrib/samples/ogl/studio/*.xpm contrib/samples/ogl/studio/*.wxr +contrib/samples/ogl/studio/StudioVC.dsp +contrib/samples/ogl/studio/StudioVC.dsw contrib/samples/ogl/studio/bitmaps/*.bmp contrib/samples/ogl/studio/bitmaps/*.gif contrib/samples/ogl/studio/bitmaps/*.xbm diff --git a/distrib/msw/stc.rsp b/distrib/msw/stc.rsp index 4b7ce49777..4e5049357b 100644 --- a/distrib/msw/stc.rsp +++ b/distrib/msw/stc.rsp @@ -1,3 +1,22 @@ +contrib/docs/html/stc/*.htm +contrib/docs/html/stc/*.gif +contrib/docs/html/stc/*.png +contrib/docs/winhelp/stc.hlp +contrib/docs/winhelp/stc.cnt +contrib/docs/pdf/stc.pdf + +contrib/docs/latex/stc/*.tex +contrib/docs/latex/stc/*.sty +contrib/docs/latex/stc/*.bib +contrib/docs/latex/stc/*.hpj +contrib/docs/latex/stc/*.ini +contrib/docs/latex/stc/*.txt +contrib/docs/latex/stc/*.cnt +contrib/docs/latex/stc/*.eps +contrib/docs/latex/stc/*.bmp +contrib/docs/latex/stc/*.gif +contrib/docs/latex/stc/*.wmf + contrib/src/stc/*.cpp contrib/src/stc/*.h contrib/src/stc/*.rc @@ -8,7 +27,15 @@ contrib/src/stc/make*.* contrib/src/stc/*.txt contrib/src/stc/*.ico contrib/src/stc/*.bmp +contrib/src/stc/StcVC.dsp +contrib/src/stc/StcVC.dsw +contrib/src/stc/README.txt +contrib/src/stc/scintilla/README.txt +contrib/src/stc/scintilla/include/*.h +contrib/src/stc/scintilla/src/*.cpp +contrib/src/stc/scintilla/src/*.cxx +contrib/src/stc/scintilla/src/*.h contrib/include/wx/stc/*.h contrib/samples/stc/*.cpp @@ -23,8 +50,6 @@ 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 +contrib/samples/stc/StcTestVC.dsp +contrib/samples/stc/StcTestVC.dsw diff --git a/distrib/msw/zipdist.bat b/distrib/msw/zipdist.bat index 27e23db06f..cf6a4ba92b 100755 --- a/distrib/msw/zipdist.bat +++ b/distrib/msw/zipdist.bat @@ -61,6 +61,9 @@ zip32 -@ %dest\wx%version%_cw.zip < %src\distrib\msw\cw.rsp rem OGL 3 zip32 -@ %dest\ogl3.zip < %src\distrib\msw\ogl.rsp +rem MMedia +zip32 -@ %dest\mmedia.zip < %src\distrib\msw\mmedia.rsp + rem GLCanvas: obsolete, now in main library rem zip32 -@ %dest\glcanvas.zip < %src\distrib\msw\glcanvas.rsp diff --git a/docs/msw/install.txt b/docs/msw/install.txt index dfe44b62ec..644357365c 100644 --- a/docs/msw/install.txt +++ b/docs/msw/install.txt @@ -30,8 +30,6 @@ program contains the following: VC++ IDE files; - JPEG library source; - Object Graphics Library; -- wxGLCanvas library; -- wxTreeLayout library; - Tex2RTF source; - Dialog Editor binary. @@ -55,7 +53,7 @@ files into a suitable directory such as c:\wx. Other add-on packages are available from the wxWindows Web site, such as: -- glcanvas.zip. Use OpenGL in a wxWindows window. +- mmedia.zip. Audio, CD, video access for Windows and Linux. - ogl3.zip. Object Graphics Library: build network diagrams, CASE tools etc. - tex2rtf3.zip. Tex2RTF: create Windows Help, HTML, and Word RTF files from the same document source. diff --git a/docs/readme.txt b/docs/readme.txt index f531a11606..b2dd7f93bd 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -70,7 +70,7 @@ wx2_x_y_cw.zip Metrowerks CodeWarrior 4.1 project files jpeg.zip Optional JPEG library tiff.zip Optional TIFF library ogl3.zip Optional Object Graphics Library -glcanvas.zip Optional wxGLCanvas class (Motif, GTK, MSW) +mmedia.zip Optional MMedia class library (Motif, GTK, MSW) tex2rtf2.zip Tex2RTF documentation tool wxWindows for GTK distribution diff --git a/samples/stc/makefile.b32 b/samples/stc/makefile.b32 new file mode 100644 index 0000000000..ae489f3a7d --- /dev/null +++ b/samples/stc/makefile.b32 @@ -0,0 +1,18 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds sample for 32-bit BC++ + +WXDIR = $(WXWIN) + +TARGET=stctest + +EXTRALIBS=$(WXDIR)\contrib\lib\stc.lib +OBJECTS = $(TARGET).obj + +!include $(WXDIR)\src\makeprog.b32 + diff --git a/src/stc/makefile.b32 b/src/stc/makefile.b32 new file mode 100644 index 0000000000..3d52701553 --- /dev/null +++ b/src/stc/makefile.b32 @@ -0,0 +1,79 @@ +# +# File: makefile.b32 +# Author: Julian Smart +# Created: 1999 +# Updated: +# Copyright: +# +# Makefile : Builds wxMMedia library for 32-bit BC++ + +# N.B. use: +# make -f makefile.b32 stc.cfg +# make -f makefile.b32 + +WXDIR = $(WXWIN) + +SCINTILLA=.\scintilla +S=$(SCINTILLA)\src + +STCEXTRACPPFLAGS=-D__WX__ -DSCI_LEXER -I$(SCINTILLA)/include -I$(S) + +LIBTARGET=$(WXDIR)\contrib\lib\stc.lib + +OBJECTS = \ + Accessor.obj \ + AutoComplete.obj \ + CallTip.obj \ + CellBuffer.obj \ + ContractionState.obj\ + Document.obj \ + Editor.obj \ + Indicator.obj \ + KeyMap.obj \ + KeyWords.obj \ + LineMarker.obj \ + PropSet.obj \ + ScintillaBase.obj \ + Style.obj \ + ViewStyle.obj \ + \ + PlatWX.obj \ + ScintillaWX.obj \ + stc.obj \ + +!include $(WXDIR)\src\makelib.b32 + +CFG = stc.cfg +CPPFLAGS=$(DLL_FLAGS) $(EXTRACPPFLAGS) @$(CFG) + +{$(S)}.cxx.obj: + bcc32 $(CPPFLAGS) -P -c {$< } + +$(CFG): makefile.b32 + copy &&! +-H=$(WXDIR)\src\msw\wx32.csm +-3 +-d +-a1 # byte alignment +-R- +-X +-w-par +-w-aus +-w-hid # virtual function A hides virtual function B +-WE +-tWM + +-I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff +-I$(WXDIR)\include\wx\msw\gnuwin32 + +-L$(BCCDIR)\lib +-D__WXWIN__ +-D__WXMSW__ +-D__WINDOWS__ +-DWIN32 +$(OPT) +$(DEBUG_FLAGS) +$(WIN95FLAG) +$(STCEXTRACPPFLAGS) +! $(CFG) + diff --git a/src/stc/scintilla/src/SVector.h b/src/stc/scintilla/src/SVector.h index 7bc948738a..49fc376dda 100644 --- a/src/stc/scintilla/src/SVector.h +++ b/src/stc/scintilla/src/SVector.h @@ -95,9 +95,9 @@ public: len = 0; } void SetLength(int newLen) { - if (newLength > len) { - if (newLength >= size) { - SizeTo(newLength); + if (newLen > len) { + if (newLen >= size) { + SizeTo(newLen); } } len = newLen;