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

diff --git a/contrib/docs/latex/mmedia/cdaudio.tex b/contrib/docs/latex/mmedia/cdaudio.tex
index 65d06f80f4dba7adfb67e7847f3fdb2c90e13630..bbacbbf225ab22acaccf5036d6ca1d4b67722d5f 100644 (file)
--- 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 286116b2290f6d4287532c541c20f0641d690339..9dcdb4f699f773bdc129417ada7c46bd1ffc9f38 100644 (file)
--- 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 81e2219a14e30c7874f32baf427728e00c595889..0d560cbdea18c7993a8873c65b2ff65f0789254e 100644 (file)
--- 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 465c495c334525e71245681a44f47cdcc4139340..1e60972d963b99984d79e9e5cb4b5017716279f7 100644 (file)
--- 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 7db6ab88999b45de7abbbc7dffc4f1e6be592227..8a19c33023a8e95d282e78cb1ed98ed0a05a1a89 100644 (file)
--- 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 5d74196e7aace6b451abe8f9c1e249d8fa3416ae..54d2c30bdcc084371a8b61722ed7611f3521c6df 100644 (file)
--- 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 (file)
index 5db5ace..0000000
--- 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 (file)
index e7cf417..0000000
Binary files a/contrib/docs/latex/mmedia/ogledit.bmp and /dev/null differ

diff --git a/contrib/docs/latex/mmedia/ogledit.gif b/contrib/docs/latex/mmedia/ogledit.gif
deleted file mode 100644 (file)
index 9784681..0000000
Binary files a/contrib/docs/latex/mmedia/ogledit.gif and /dev/null differ

diff --git a/contrib/docs/latex/mmedia/sample.tex b/contrib/docs/latex/mmedia/sample.tex
index 1bf55b767917e44f6d88aa1e3d94b24f1142b5be..8b8e65c0af10ae4c84bb3bc74836f367e43e6392 100644 (file)
--- 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 73e9ab84b9e285d275dea1296964b1bc4caa09a3..bc719ba1d9a88681ca432a569695562d0fd7b0d5 100644 (file)
--- 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 41dd2cffa3d1ce89dacb80375f5ebf853f00e3b8..d261135eed9613b52bdcb685ce0c3f76fc54fba8 100644 (file)
--- 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 6ac8da40698e27fc0f7c640cc23dec2fe96baa58..02159265edf31d2b0a1726245f11a008dd3df9d0 100644 (file)
--- 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 09b77444129fd118f17849a0a604b16a90452c38..38ece531c281fe5c46a4913ddacf374fdaf40aae 100644 (file)
--- 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 a2672b406222fbc72a2a148310b67f92826dbd20..9aad585f2829e19b71b73a6b822a842ee1fb9b98 100644 (file)
--- 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 (file)
index 0000000..ae489f3
--- /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 (file)
index 0000000..3d52701
--- /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 7bc948738a4270d4195d2df026a2f39268016cac..49fc376ddacbe0ddc8b8bed3e6c6c6276a35985d 100644 (file)
--- 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 f988fd7c47a2c8cab3b0cc8212c030b1374268ab..5e4f4911a61087cb125e769308f61cf61bb78b5f 100644 (file)
--- 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 430cecab93bf476f35e06f1574e8841dc74c5678..56836e991b917d5165bc5c257c0de03e6c7efe60 100644 (file)
--- 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 (file)
index 0000000..8ca494f
--- /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 3f16da6a2d8413e747bcc0398066bdb3432b43f6..e9d11d0e62999c276f51ae3eaae7fa6a079a403b 100644 (file)
--- 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 4b7ce49777c603ed7764615049d414572fcc2cd1..4e5049357b0c6dedcf825b7e66599393f1e2217c 100644 (file)
--- 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 27e23db06f7932692b7d8b3b324ef2905bb47fe6..cf6a4ba92bdeb397d1064371aaba8d7c4d8408d9 100755 (executable)
--- 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 dfe44b62eca1b4707eded7af0984ea53067bb741..644357365cada822c2e2b95aae79310c2d87ac8e 100644 (file)
--- 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 f531a11606e6a1673b0bac7b4032e8aa53eafc05..b2dd7f93bdbaeb72806abdd5429371f001de66c9 100644 (file)
--- 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 (file)
index 0000000..ae489f3
--- /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 (file)
index 0000000..3d52701
--- /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 7bc948738a4270d4195d2df026a2f39268016cac..49fc376ddacbe0ddc8b8bed3e6c6c6276a35985d 100644 (file)
--- 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;