Some doc updates,

  makefile and distrib things.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6639 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index c3e5994dec01eb6153ab1b50a1cfe1c86be76dcf..22f231760c6297dd9a7d6ce70c9fd399b3a9196e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -485,10 +485,15 @@ ALL_DIST: distclean
        cp $(WXDIR)/mkinstalldirs $(DISTDIR)
        cp $(WXDIR)/wx-config.in $(DISTDIR)
        cp $(WXDIR)/setup.h.in $(DISTDIR)
+       cp $(WXDIR)/setup.h_vms $(DISTDIR)
+       cp $(WXDIR)/descrip.mms $(DISTDIR)
        cp $(WXDIR)/Makefile.in $(DISTDIR)
        cp $(DOCDIR)/lgpl.txt $(DISTDIR)/COPYING.LIB
        cp $(DOCDIR)/licence.txt $(DISTDIR)/LICENCE.txt
        cp $(DOCDIR)/symbols.txt $(DISTDIR)/SYMBOLS.txt
+       mkdir $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms.opt $(DISTDIR)/lib
+       cp $(WXDIR)/lib/vms_gtk.opt $(DISTDIR)/lib
 
 # this target is the common part of distribution script for all GUI toolkits,
 # but is not used when building wxBase distribution
@@ -529,13 +534,16 @@ ALL_GUI_DIST: ALL_DIST
        cp $(SRCDIR)/*.in $(DISTDIR)/src
        cp $(COMMDIR)/*.cpp $(DISTDIR)/src/common
        cp $(COMMDIR)/*.c $(DISTDIR)/src/common
-       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
-       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
        cp $(COMMDIR)/*.inc $(DISTDIR)/src/common
        cp $(COMMDIR)/*.l $(DISTDIR)/src/common
        cp $(COMMDIR)/*.h $(DISTDIR)/src/common
        cp $(COMMDIR)/*.y $(DISTDIR)/src/common
+       cp $(COMMDIR)/*.mms $(DISTDIR)/src/common
+       cp $(UNIXDIR)/*.c $(DISTDIR)/src/unix
+       cp $(UNIXDIR)/*.cpp $(DISTDIR)/src/unix
+       cp $(UNIXDIR)/*.mms $(DISTDIR)/src/unix
        cp $(GENDIR)/*.cpp $(DISTDIR)/src/generic
+       cp $(GENDIR)/*.mms $(DISTDIR)/src/generic
        cp $(HTMLDIR)/*.cpp $(DISTDIR)/src/html
        cp $(HTMLDIR)/bitmaps/*.xpm $(DISTDIR)/src/html/bitmaps
        cp $(PNGDIR)/*.h $(DISTDIR)/src/png
@@ -544,6 +552,7 @@ ALL_GUI_DIST: ALL_DIST
        cp $(ZLIBDIR)/*.h $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/*.c $(DISTDIR)/src/zlib
        cp $(ZLIBDIR)/README $(DISTDIR)/src/zlib
+       cp $(ZLIBDIR)/*.mms $(DISTDIR)/src/zlib
        cp $(JPEGDIR)/*.h $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/*.c $(DISTDIR)/src/jpeg
        cp $(JPEGDIR)/README $(DISTDIR)/src/jpeg
@@ -589,6 +598,9 @@ GTK_DIST: ALL_GUI_DIST
        cp $(GTKDIR)/*.cpp $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.c $(DISTDIR)/src/gtk
        cp $(GTKDIR)/*.xbm $(DISTDIR)/src/gtk
+       cp $(GTKDIR)/*.mms $(DISTDIR)/src/gtk
+       mkdir $(DISTDIR)/contrib
+       cp -R $(WXDIR)/contrib $(DISTDIR)
 
 MOTIF_DIST: ALL_GUI_DIST
        cp $(WXDIR)/wxMOTIF.spec $(DISTDIR)
@@ -683,6 +695,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/checklst/makefile.unx $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.cpp $(DISTDIR)/samples/checklst
        cp $(SAMPDIR)/checklst/*.xpm $(DISTDIR)/samples/checklst
+       cp $(SAMPDIR)/checklst/*.mms $(DISTDIR)/samples/checklst
 
        mkdir $(DISTDIR)/samples/config
        cp $(SAMPDIR)/config/Makefile.in $(DISTDIR)/samples/config
@@ -700,6 +713,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/controls/makefile.unx $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.cpp $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/*.xpm $(DISTDIR)/samples/controls
+       cp $(SAMPDIR)/controls/*.mms $(DISTDIR)/samples/controls
        cp $(SAMPDIR)/controls/icons/*.??? $(DISTDIR)/samples/controls/icons
 
        mkdir $(DISTDIR)/samples/db
@@ -715,6 +729,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/dialogs/*.cpp $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.h $(DISTDIR)/samples/dialogs
        cp $(SAMPDIR)/dialogs/*.txt $(DISTDIR)/samples/dialogs
+       cp $(SAMPDIR)/dialogs/*.mms $(DISTDIR)/samples/dialogs
 
        mkdir $(DISTDIR)/samples/dnd
        cp $(SAMPDIR)/dnd/Makefile.in $(DISTDIR)/samples/dnd
@@ -828,6 +843,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/image/Makefile.in $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/makefile.unx $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/*.cpp $(DISTDIR)/samples/image
+       cp $(SAMPDIR)/image/*.mms $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/horse.* $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/smile.xbm $(DISTDIR)/samples/image
        cp $(SAMPDIR)/image/smile.xpm $(DISTDIR)/samples/image
@@ -901,6 +917,7 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/minimal/makefile.unx $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
+       cp $(SAMPDIR)/minimal/*.mms $(DISTDIR)/samples/minimal
 
        mkdir $(DISTDIR)/samples/dialup
        cp $(SAMPDIR)/dialup/Makefile.in $(DISTDIR)/samples/dialup
@@ -1071,10 +1088,6 @@ SAMPLES_DIST: ALL_GUI_DIST
        cp $(SAMPDIR)/wizard/*.xpm $(DISTDIR)/samples/wizard
     
 UTILS_DIST: ALL_GUI_DIST
-       mkdir $(DISTDIR)/utils
-       cp $(UTILSDIR)/Makefile.in $(DISTDIR)/utils
-       cp $(UTILSDIR)/configure $(DISTDIR)/utils
-       cp $(UTILSDIR)/configure.in $(DISTDIR)/utils
 
 MISC_DIST: ALL_GUI_DIST
        mkdir $(DISTDIR)/misc

diff --git a/docs/gtk/changes.txt b/docs/gtk/changes.txt
index abc2c00ef30aa2e4dcddf7f61e9ee421f5a2c33d..8afa17d42e8943132fcc9abd8a2b3e0c2ea67260 100644 (file)
--- a/docs/gtk/changes.txt
+++ b/docs/gtk/changes.txt
@@ -1,6 +1,12 @@
-12th March '2000: wxWindows 2.1.14 released
+19th March '2000: wxWindows 2.1.14 released
 
+An extra library for the OpenGl class now gets builts
+and installed. There is also an extra RPM for this 
+small class now.
 
+Added possibility to compile wxGTK with already installed
+image libraries (TIFF, JPEG, PNG, ZLIB) if you really
+know what you are doing.
 
 Added support for pipes and a stream class to get data
 out of them.

diff --git a/docs/gtk/readme.txt b/docs/gtk/readme.txt
index d7b00d1128cb3cb17aca4eb98c40fd963c9ee68e..44dbddac2d02e4632cfd23fa1df3e193490c0311 100644 (file)
--- a/docs/gtk/readme.txt
+++ b/docs/gtk/readme.txt
@@ -12,7 +12,7 @@ freeze and only bugs will be corrected.
 
 wxWindows no longer supports GTK 1.0 (as did some early
 snapshots) so that you will need GTK 1.2 when using it.
-GTK 1.2.6 is recommended although somw programs will work
+GTK 1.2.6 is recommended although some programs will work
 with GTK 1.2.3 onwards.
 
 More information is available from my homepage at:

diff --git a/docs/latex/wx/brush.tex b/docs/latex/wx/brush.tex
index a12f90b4dd67a8f0837d202f736934f7fcda0f33..fd1c0a756c239c7fdf86b268a82f1fadee2b5bc3 100644 (file)
--- a/docs/latex/wx/brush.tex
+++ b/docs/latex/wx/brush.tex
@@ -169,6 +169,7 @@ Returns the brush style, one of:
 \twocolitem{{\bf wxHORIZONTAL\_HATCH}}{Horizontal hatch.}
 \twocolitem{{\bf wxVERTICAL\_HATCH}}{Vertical hatch.}
 \twocolitem{{\bf wxSTIPPLE}}{Stippled using a bitmap.}
+\twocolitem{{\bf wxSTIPPLE_MASK_OPAQUE}}{Stippled using a bitmap's mask.}
 \end{twocollist}
 
 \wxheading{See also}
@@ -214,13 +215,17 @@ Sets the stipple bitmap.
 
 \wxheading{Remarks}
 
-The style will be set to wxSTIPPLE.
+The style will be set to wxSTIPPLE, unless the bitmap has a mask associated
+to it, in which case the style will be set to wxSTIPPLE_MASK_OPAQUE.
 
-Note that there is a big difference between stippling in X and Windows.
-On X, the stipple is a mask between the wxBitmap and current colour.
-On Windows, the current colour is ignored, and the bitmap colour is used.
-However, for pre-defined modes like wxCROSS\_HATCH, the behaviour is the
-same for both platforms.
+If the wxSTIPPLE variant is used, the bitmap will be used to fill out the
+area to be drawn. If the wxSTIPPLE_MASK_OPAQUE is used, the current
+text foreground and text background determine what colours are used for
+displaying and the bits in the mask (which is a mono-bitmap actually)
+determine where to draw what.
+
+Note that under Windows 95, only 8x8 pixel large stipple bitmaps are
+supported, Windows 98 and NT as well as GTK support arbitrary bitmaps.
 
 \wxheading{See also}
 
@@ -244,6 +249,7 @@ Sets the brush style.
 \twocolitem{{\bf wxHORIZONTAL\_HATCH}}{Horizontal hatch.}
 \twocolitem{{\bf wxVERTICAL\_HATCH}}{Vertical hatch.}
 \twocolitem{{\bf wxSTIPPLE}}{Stippled using a bitmap.}
+\twocolitem{{\bf wxSTIPPLE_MASK_OPAQUE}}{Stippled using a bitmap's mask.}
 \end{twocollist}}
 
 \wxheading{See also}

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index b8e445a1a25b44bbf765d000cf5750c40e943a60..d0061f3d62ed86c9abf4de531684305d72f15500 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -25,13 +25,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWindows 2.1.13: A portable C++ and Python GUI toolkit}
+\title{wxWindows 2.1.14: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{February 11th 2000}
+\date{March 19th 2000}
 }
 \makeindex
 \begin{document}