Distrib and make install fixes.

  Docs for wxSizer finished.

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

diff --git a/Makefile.in b/Makefile.in
index 504eefe05f95fe3c6645ab2ed01d01b6f46cf05c..4d357e5bfd68e78d16e97660aab43581764865c3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 17:12, 1999/08/25
+# This file was automatically generated by tmake at 16:01, 1999/08/26
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -114,12 +114,13 @@ MSWDIR   = $(WXDIR)/src/msw
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
+MISCDIR  = $(WXDIR)/misc
 
 DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -1841,6 +1842,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(prefix)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
+       $(INSTALL) -d $(datadir)
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -1851,6 +1853,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
@@ -1890,6 +1898,11 @@ uninstall:
        @echo " Removing helper files..."
        @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        @$(RM) $(bindir)/wx-config
+       @$(RM) $(datadir)/wx/afm/*
+       @$(RM) $(datadir)/wx/gs_afm/*
+       @rmdir $(datadir)/wx/gs_afm
+       @rmdir $(datadir)/wx/afm
+       @rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
@@ -1901,7 +1914,7 @@ uninstall:
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@@ -2220,7 +2233,14 @@ UTILS_DIST:
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST
+MISC_DIST:
+       mkdir $(DISTDIR)/misc
+       mkdir $(DISTDIR)/misc/afm
+       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+       mkdir $(DISTDIR)/misc/gs_afm
+       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
+       
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
 

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index dcb078b7436c03f73c73b2fcb69a59d180c729e4..11719f36d164a8e5df748d9621c376d2b451c709 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -284,12 +284,13 @@ MSWDIR   = $(WXDIR)/src/msw
 INCDIR   = $(WXDIR)/include
 SAMPDIR  = $(WXDIR)/samples
 UTILSDIR = $(WXDIR)/utils
+MISCDIR  = $(WXDIR)/misc
 
 DOCDIR = $(WXDIR)/docs
 
 ########################## Archive name ###############################
 
-WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER).tgz
+WXARCHIVE = wx$(TOOLKIT)-$(WX_MAJOR_VERSION_NUMBER).$(WX_MINOR_VERSION_NUMBER).$(WX_RELEASE_NUMBER)-b9.tgz
 DISTDIR = ./_dist_dir/wx$(TOOLKIT)
 
 ############################## Files ##################################
@@ -543,6 +544,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(prefix)
        $(INSTALL) -d $(bindir)
        $(INSTALL) -d $(libdir)
+       $(INSTALL) -d $(datadir)
 
        $(INSTALL_SCRIPT) $(top_builddir)/wx-config $(bindir)/wx-config
        $(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
@@ -553,6 +555,12 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        
+       $(INSTALL) -d $(datadir)/wx
+       $(INSTALL) -d $(datadir)/wx/afm
+       $(INSTALL) -d $(datadir)/wx/gs_afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/afm/*.afm $(datadir)/wx/afm
+       $(INSTALL_DATA) $(top_srcdir)/misc/gs_afm/*.afm $(datadir)/wx/gs_afm
+       
        $(INSTALL) -d $(includedir)/wx
        $(INSTALL) -d $(includedir)/wx/msw
        $(INSTALL) -d $(includedir)/wx/gtk
@@ -592,6 +600,11 @@ uninstall:
        @echo " Removing helper files..."
        @$(RM) $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
        @$(RM) $(bindir)/wx-config
+       @$(RM) $(datadir)/wx/afm/*
+       @$(RM) $(datadir)/wx/gs_afm/*
+       @rmdir $(datadir)/wx/gs_afm
+       @rmdir $(datadir)/wx/afm
+       @rmdir $(datadir)/wx
        @echo " Removing headers..."
        @list='$(HEADERS)'; for p in $$list; do \
          $(RM) $(includedir)/wx/$$p; \
@@ -603,7 +616,7 @@ uninstall:
        @if test -d $(libdir)/wx; then rmdir $(libdir)/wx; fi
        @if test -d $(includedir)/wx/gtk; then rmdir $(includedir)/wx/gtk; fi
        @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/motif; fi
-       @if test -d $(includedir)/wx/motif; then rmdir $(includedir)/wx/msw; fi
+       @if test -d $(includedir)/wx/msw; then rmdir $(includedir)/wx/msw; fi
        @if test -d $(includedir)/wx/html; then rmdir $(includedir)/wx/html; fi
        @if test -d $(includedir)/wx/unix; then rmdir $(includedir)/wx/unix; fi
        @if test -d $(includedir)/wx/generic; then rmdir $(includedir)/wx/generic; fi
@@ -922,7 +935,14 @@ UTILS_DIST:
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.h $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        cp $(UTILSDIR)/glcanvas/$(TOOLKITDIR)/*.cpp $(DISTDIR)/utils/glcanvas/$(TOOLKITDIR)
        
-dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST
+MISC_DIST:
+       mkdir $(DISTDIR)/misc
+       mkdir $(DISTDIR)/misc/afm
+       cp $(MISCDIR)/afm/*.afm  $(DISTDIR)/misc/afm
+       mkdir $(DISTDIR)/misc/gs_afm
+       cp $(MISCDIR)/gs_afm/*.afm  $(DISTDIR)/misc/gs_afm
+       
+dist: ALL_DIST @GUIDIST@ SAMPLES_DIST UTILS_DIST MISC_DIST
        cd _dist_dir; tar ch wx$(TOOLKIT) | gzip -f9 > $(WXARCHIVE); mv $(WXARCHIVE) ..
        $(RM) -r _dist_dir
 

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 6a992091c33cedaa034c72079e826d02c649927f..e51428e9ec6c6368b4cba45c6c92bd1da4ef8132 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -30,7 +30,7 @@
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin et al}
-\date{August 25th 1999}
+\date{August 27th 1999}
 }
 \makeindex
 \begin{document}

diff --git a/docs/latex/wx/sizer.tex b/docs/latex/wx/sizer.tex
index 81ed5dd73cbb1aff249dfd4491250a33568ff945..f522137bd730e0fb4b4e5db6fdf7453b6bc4457d 100644 (file)
--- a/docs/latex/wx/sizer.tex
+++ b/docs/latex/wx/sizer.tex
@@ -69,6 +69,27 @@ using the {\it option} flag and the result will be that the left button will be
 side of the dialog and the right button with the right side - the space in between will shrink and grow with
 the dialog.}
 
+\docparam{option}{Although the meaning of this parameter is undefined in wxSizer, it is used in wxBoxSizer
+to indicate if a child of a sizer can change its size in the main orientation of the wxBoxSizer - where
+0 stands for not changable and a value of more than zero in interpreted relative to the value of other
+children of the same wxBoxSizer. You might, e.g., have a horizontal wxBoxSizer with three children, two
+of which are supposed to change their size with the sizer, then the two stretchable windows would get a 
+value of 1 each to make them grow and shrink equally with the sizer's vertical dimension.}
+
+\docparam{flag}{This parameter can be used to set a number of flags which can be combined using
+the binary OR operator |. Two main behaviours are defined using these flags: One is the border
+around a window: the {\it border} parameter determines the border width whereas the flags given here
+determine where the border may be (wxTOP, wxBOTTOM, wxLEFT, wxRIGHT or wxALL). The other flags
+determine the child window's behaviour if the size of the sizer changes, but - in contrast to
+the {\it option} flag - not in the main orientation, but the respectively other orientation. So
+if you created a wxBoxSizer with the wxVERTICAL option, these flags will be relevant if the
+sizer changes its horizontal size. A child may get resized to completely fill out the new size (using
+either wxGROW or wxEXPAND), may get centered (wxCENTER or wxCENTRE) or may get aligned to either
+side (wxALIGN_LEFT and wxALIGN_TOP are set to 0 and thus represent the default, wxALIGN_RIGHT and
+wxALIGN_BOTTOM have their obvious meaning.}
+
+\docparam{border}{Determines the border width, if the {\it flag} parameter is set to any border.}
+
 \membersection{wxSizer::Prepend}\label{wxsizerprepend}
 
 \func{void}{Prepend}{\param{wxWindow* }{window}, \param{int }{option = 0}, \param{int }{flag = 0}, \param{int }{border = 0}}

diff --git a/wxGTK.spec b/wxGTK.spec
index 254252822b0f6789e91a0757aa81fc48baf9604e..89ac458588c53c9bbac8b15e3d479a49cd7fc326 100644 (file)
--- a/wxGTK.spec
+++ b/wxGTK.spec
@@ -38,7 +38,7 @@ Header files for the wxGTK, the GTK+ 1.2 port of the wxWindows library.
 ./configure --prefix=%{pref} --enable-threads --disable-std_iostreams
 
 %build
-cd src && make
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT

diff --git a/wxMotif.spec b/wxMotif.spec
index b750c4b63436eb8518932e03f0acc399a0c7e0c8..7c9b86dc9dbb08f12113319730aa0bf701fc031c 100644 (file)
--- a/wxMotif.spec
+++ b/wxMotif.spec
@@ -29,7 +29,7 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 ./configure --prefix=%{pref} --disable-threads --disable-std_iostreams
 
 %build
-cd src && make
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT

diff --git a/wxWINE.spec b/wxWINE.spec
index 70e5230a10b096855a663c8e79a92289cc5761d9..23f7da7af9749e10c72261f64b1f54d480b78498 100644 (file)
--- a/wxWINE.spec
+++ b/wxWINE.spec
@@ -29,7 +29,7 @@ Motif/LessTif, MS Windows, Mac) from the same source code.
 ./configure --prefix=%{pref}
 
 %build
-cd src && make
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT