Misc small fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4449 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 1999-11-09 01:52:28 +00:00
parent 154f22b3fa
commit a925b00678
17 changed files with 104 additions and 154 deletions

View File

@ -44,6 +44,10 @@ docs/changes.txt
docs/upgrade.txt docs/upgrade.txt
docs/todo.txt docs/todo.txt
docs/licence.txt docs/licence.txt
docs/licendoc.txt
docs/preamble.txt
docs/gpl.txt
docs/lgpl.txt
docs/symbols.txt docs/symbols.txt
docs/bugs.txt docs/bugs.txt
docs/*.htm docs/*.htm

View File

@ -32,53 +32,6 @@ src/iodbc/build
src/iodbc/Changes.log src/iodbc/Changes.log
src/iodbc/postgres/*.h src/iodbc/postgres/*.h
setup/*.in
setup/*.hin
setup/general/createall
setup/general/jointar
setup/general/makeapp
setup/general/makedirs
setup/general/makedoc
setup/general/mygrep
setup/general/needed
setup/rules/bin
setup/rules/bin2
setup/rules/doc
setup/rules/gbin
setup/rules/gbin2
setup/rules/glib
setup/rules/glibbin
setup/rules/glibgbin
setup/rules/gslib
setup/rules/lib
setup/rules/libbin
setup/rules/libgbin
setup/rules/generic/bin1
setup/rules/generic/bin1gen
setup/rules/generic/bin2
setup/rules/generic/bin2gen
setup/rules/generic/depend
setup/rules/generic/globals
setup/rules/generic/lib
setup/rules/generic/needed
setup/rules/generic/obj
setup/rules/generic/slib
setup/rules/generic/sobj
setup/shared/sharedAIX
setup/shared/sharedBsd
setup/shared/sharedDgux
setup/shared/sharedHpux
setup/shared/sharedIrix
setup/shared/sharedLinux
setup/shared/sharedOSF
setup/shared/sharedSolaris2
setup/shared/sharedSunos4
setup/shared/sharedSysV
misc/afm/*.afm misc/afm/*.afm
misc/gs_afm/*.afm misc/gs_afm/*.afm

View File

@ -46,7 +46,6 @@ samples/wizard/Makefile.in
samples/wxpoem/Makefile.in samples/wxpoem/Makefile.in
samples/wxsocket/Makefile.in samples/wxsocket/Makefile.in
samples/nettest/Makefile.in samples/nettest/Makefile.in
samples/scrollsub/Makefile.in
samples/font/Makefile.in samples/font/Makefile.in
samples/menu/Makefile.in samples/menu/Makefile.in
samples/console/Makefile.in samples/console/Makefile.in

View File

@ -30,59 +30,9 @@ include/wx/install-sh
docs/motif/*.txt docs/motif/*.txt
docs/motif/makewxmotif docs/motif/makewxmotif
docs/motif2/*.txt
docs/motif2/COPYING.LIB
lib/dummy lib/dummy
misc/afm/*.afm misc/afm/*.afm
misc/gs_afm/*.afm misc/gs_afm/*.afm
setup/*.in
setup/*.hin
setup/general/createall
setup/general/jointar
setup/general/makeapp
setup/general/makedirs
setup/general/makedoc
setup/general/mygrep
setup/general/needed
setup/rules/bin
setup/rules/bin2
setup/rules/doc
setup/rules/gbin
setup/rules/gbin2
setup/rules/glib
setup/rules/glibbin
setup/rules/glibgbin
setup/rules/gslib
setup/rules/lib
setup/rules/libbin
setup/rules/libgbin
setup/rules/generic/bin1
setup/rules/generic/bin1gen
setup/rules/generic/bin2
setup/rules/generic/bin2gen
setup/rules/generic/depend
setup/rules/generic/globals
setup/rules/generic/lib
setup/rules/generic/needed
setup/rules/generic/obj
setup/rules/generic/slib
setup/rules/generic/sobj
setup/shared/sharedAIX
setup/shared/sharedBsd
setup/shared/sharedDgux
setup/shared/sharedHpux
setup/shared/sharedIrix
setup/shared/sharedLinux
setup/shared/sharedOSF
setup/shared/sharedSolaris2
setup/shared/sharedSunos4
setup/shared/sharedSysV

View File

@ -43,7 +43,7 @@
#! these files don't compile #! these files don't compile
next if $file =~ /^pnghand\./; next if $file =~ /^pnghand\./;
next if $wxGeneric{$file} =~ /\b16\b/; #! next if $wxGeneric{$file} =~ /\b16\b/;
my $isOleObj = $wxMSW{$file} =~ /\bO\b/; my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
my $isCFile = $file =~ /\.c$/; my $isCFile = $file =~ /\.c$/;

View File

@ -50,11 +50,6 @@ item: Create Shortcut
Destination=%GROUP%\Tex2RTF Help.lnk Destination=%GROUP%\Tex2RTF Help.lnk
Working Directory=%MAINDIR% Working Directory=%MAINDIR%
end end
item: Create Shortcut
Source=%MAINDIR%\docs\winhelp\wxtree.hlp
Destination=%GROUP%\wxTree Help.lnk
Working Directory=%MAINDIR%
end
item: Create Shortcut item: Create Shortcut
Source=%MAINDIR%\docs\html\index.htm Source=%MAINDIR%\docs\html\index.htm
Destination=%GROUP%\HTML Docs Index.lnk Destination=%GROUP%\HTML Docs Index.lnk
@ -70,8 +65,30 @@ item: Create Shortcut
Destination=%GROUP%\Dialog Editor.lnk Destination=%GROUP%\Dialog Editor.lnk
Working Directory=%MAINDIR% Working Directory=%MAINDIR%
end end
item: Create Shortcut
Source=%MAINDIR%\docs\release.txt
Destination=%GROUP%\Release Details.lnk
Working Directory=%MAINDIR%
end
item: Create Shortcut
Source=%MAINDIR%\docs\winhelp\wxtree.hlp
Destination=%GROUP%\wxTreeLayout Help.lnk
Working Directory=%MAINDIR%
end
item: Else Statement item: Else Statement
end end
item: Add ProgMan Icon
Group=%GROUP%
Icon Name=wxTreeLayout Help
Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp
Default Directory=%MAINDIR%
end
item: Add ProgMan Icon
Group=%GROUP%
Icon Name=Release Details
Command Line=%MAINDIR%\docs\release.txt
Default Directory=%MAINDIR%
end
item: Add ProgMan Icon item: Add ProgMan Icon
Group=%GROUP% Group=%GROUP%
Icon Name=Dialog Editor Icon Name=Dialog Editor
@ -126,12 +143,6 @@ item: Add ProgMan Icon
Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp Command Line=%MAINDIR%\docs\winhelp\tex2rtf.hlp
Default Directory=%MAINDIR% Default Directory=%MAINDIR%
end end
item: Add ProgMan Icon
Group=%GROUP%
Icon Name=wxTree Help
Command Line=%MAINDIR%\docs\winhelp\wxtree.hlp
Default Directory=%MAINDIR%
end
item: End Block item: End Block
end end
item: Self-Register OCXs/DLLs item: Self-Register OCXs/DLLs

View File

@ -1,7 +1,7 @@
Document Type: WSE Document Type: WSE
item: Global item: Global
Version=5.0 Version=5.0
Title=wxWindows 2.1.10 Installation Title=wxWindows 2.1.11 Installation
Flags=00000100 Flags=00000100
Split=1420 Split=1420
Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@ -47,7 +47,7 @@ item: End Block
end end
item: Set Variable item: Set Variable
Variable=APPTITLE Variable=APPTITLE
Value=wxWindows 2.1.10 Value=wxWindows 2.1.11
end end
item: Set Variable item: Set Variable
Variable=GROUP Variable=GROUP

View File

@ -12,6 +12,7 @@ if "%dest" == "" goto usage
if "%1" == "-help" goto usage if "%1" == "-help" goto usage
if "%1" == "--help" goto usage if "%1" == "--help" goto usage
if "%1" == "/?" goto usage if "%1" == "/?" goto usage
if "%1" == "wiseonly" goto dounzip
if "%1" == "wise" set wise=1 if "%1" == "wise" set wise=1
echo About to archive an external wxWindows distribution: echo About to archive an external wxWindows distribution:
echo From %src echo From %src
@ -20,8 +21,6 @@ if "%wise" == "1" echo with WISE setup creation.
echo CTRL-C if this is not correct. echo CTRL-C if this is not correct.
pause pause
rem goto dounzip
erase %dest\wx*.zip erase %dest\wx*.zip
erase %dest\glcanvas.zip erase %dest\glcanvas.zip
erase %dest\ogl3.zip erase %dest\ogl3.zip
@ -79,16 +78,17 @@ copy %src\docs\msw\install.txt %dest\install_msw.txt
copy %src\docs\motif\install.txt %dest\install_motif.txt copy %src\docs\motif\install.txt %dest\install_motif.txt
copy %src\docs\gtk\install.txt %dest\install_gtk.txt copy %src\docs\gtk\install.txt %dest\install_gtk.txt
copy %src\docs\readme.txt %dest copy %src\docs\readme.txt %dest
copy %src\docs\release.txt %dest
copy %src\docs\motif\makewxmotif %dest copy %src\docs\motif\makewxmotif %dest
copy %src\docs\gtk\makewxgtk %dest copy %src\docs\gtk\makewxgtk %dest
Rem Skip WISE setup if wise is 0.
if "%wise" == "0" goto end
:dounzip :dounzip
cd %dest cd %dest
Rem Skip WISE setup if wise is 0.
if "%wise" == "0" goto end
rem Unzip the Windows files into 'wx' rem Unzip the Windows files into 'wx'
mkdir %dest\wx mkdir %dest\wx
@ -134,14 +134,34 @@ Rem ren %WXWIN\deliver\setup.EXE %WXWIN\deliver\setup_%version%.exe
cd %dest cd %dest
Rem tidy up capitalisation of filenames
ren setup.EXE s
ren s setup.exe
ren setup.w02 s
ren s setup.w02
ren setup.w03 s
ren s setup.w03
ren setup.w04 s
ren s setup.w04
ren setup.w05 s
ren s setup.w05
ren setup.w06 s
ren s setup.w06
echo wxWindows archived. echo wxWindows archived.
goto end goto end
:usage :usage
echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files, echo DOS wxWindows distribution. Zips up all GTK/Motif/MSW/doc files,
echo and optionally makes a deliver\wx directory and a setup.exe echo and optionally makes a deliver\wx directory and a setup.exe
echo if you specify 'wise'. echo if you specify 'wise' (skipping the zipping if you use 'wiseonly').
echo. echo.
echo Usage: zipdist [wise] echo Usage: zipdist [wise | wiseonly]
:end :end

View File

@ -3,9 +3,9 @@
# and makes wxGTK. # and makes wxGTK.
# Call from top-level wxWindows directory. # Call from top-level wxWindows directory.
# Note that this uses standard (but commonly-used) configure options; # Note that this uses standard (but commonly-used) configure options;
# if you're feeling brave, you may wish to compile with threads. # if you're feeling braven, you may wish to compile with threads.
# -- Julian Smart # -- Julian Smart
chmod a+x configure config.sub config.guess setup/general/* setup/shared/* rm -f *.cache
./configure --with-shared --with-gtk --with-debug_flag --with-debug_info --without-threads chmod a+x configure config.sub config.guess
make makefiles ./configure --disable-shared --with-gtk --with-debug_flag --with-debug_info --enable-debug --without-threads --without-sockets -without-odbc -without-libjpeg
make make

View File

@ -20,8 +20,8 @@ First steps
(not yet tested). Motif 2.0 and above may also be suitable. (not yet tested). Motif 2.0 and above may also be suitable.
- Download the appropriate .tgz archive, or alternatively the files - Download the appropriate .tgz archive, or alternatively the files
wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a preferred format, wx2_x_y_gen.zip and wx2_x_y_mot.zip. Download documentation in a
such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip. preferred format, such as wx2_x_y_htm.zip or wx2_x_y_pdf.zip.
- Make a directory such as ~/wx and unarchive the files into this - Make a directory such as ~/wx and unarchive the files into this
directory. If using the zip archives, use the -a option if available directory. If using the zip archives, use the -a option if available

View File

@ -5,7 +5,7 @@
# Note that this uses standard (but commonly-used) configure options; # Note that this uses standard (but commonly-used) configure options;
# if you're feeling brave, you may wish to compile with threads. # if you're feeling brave, you may wish to compile with threads.
# -- Julian Smart # -- Julian Smart
chmod a+x configure config.sub config.guess setup/general/* setup/shared/* rm -f *.cache
./configure --with-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --without-threads chmod a+x configure config.sub config.guess
make makefiles ./configure --disable-shared --with-motif --without-gtk --with-debug_flag --with-debug_info --enable-debug --without-sockets --without-odbc --without-threads --enable-newgrid
make make

View File

@ -116,7 +116,6 @@ wxMotif-2.x.y.tgz wxMotif source distribution. You will
-- OR -- from the zip set (above). -- OR -- from the zip set (above).
wx2_x_y_gen.zip wx2_x_y_gen.zip
wx2_x_y_msw.zip
wx2_x_y_mot.zip wx2_x_y_mot.zip
jpeg.zip jpeg.zip

View File

@ -31,4 +31,9 @@ wxWindows Release Notes
- wxHTML printing has spacing problems under Windows, and may not - wxHTML printing has spacing problems under Windows, and may not
work fully under Unix. Hopefully this will be resolved for 2.1.12. work fully under Unix. Hopefully this will be resolved for 2.1.12.
- wxStaticBox under Windows obscures controls placed within it:
this will be fixed in 2.1.12.
- wxStaticBitmap under Windows doesn't respect the transparency mask.

View File

@ -1,6 +1,6 @@
#!/binb/wmake.exe #!/binb/wmake.exe
# This file was automatically generated by tmake at 10:10, 1999/11/06 # This file was automatically generated by tmake at 22:33, 1999/11/08
# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T! # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
# #
@ -212,6 +212,7 @@ MSWOBJS = accel.obj &
filedlg.obj & filedlg.obj &
font.obj & font.obj &
fontdlg.obj & fontdlg.obj &
fontenum.obj &
fontutil.obj & fontutil.obj &
frame.obj & frame.obj &
gauge95.obj & gauge95.obj &
@ -220,9 +221,11 @@ MSWOBJS = accel.obj &
gsocket.obj & gsocket.obj &
helpwin.obj & helpwin.obj &
icon.obj & icon.obj &
imaglist.obj &
iniconf.obj & iniconf.obj &
joystick.obj & joystick.obj &
listbox.obj & listbox.obj &
listctrl.obj &
main.obj & main.obj &
mdi.obj & mdi.obj &
menu.obj & menu.obj &
@ -231,6 +234,7 @@ MSWOBJS = accel.obj &
minifram.obj & minifram.obj &
msgdlg.obj & msgdlg.obj &
nativdlg.obj & nativdlg.obj &
notebook.obj &
oleutils.obj & oleutils.obj &
ownerdrw.obj & ownerdrw.obj &
palette.obj & palette.obj &
@ -262,6 +266,7 @@ MSWOBJS = accel.obj &
thread.obj & thread.obj &
timer.obj & timer.obj &
tooltip.obj & tooltip.obj &
treectrl.obj &
utils.obj & utils.obj &
utilsexc.obj & utilsexc.obj &
uuid.obj & uuid.obj &
@ -402,6 +407,9 @@ font.obj: $(MSWDIR)\font.cpp
fontdlg.obj: $(MSWDIR)\fontdlg.cpp fontdlg.obj: $(MSWDIR)\fontdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
fontenum.obj: $(MSWDIR)\fontenum.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
fontutil.obj: $(MSWDIR)\fontutil.cpp fontutil.obj: $(MSWDIR)\fontutil.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -426,6 +434,9 @@ helpwin.obj: $(MSWDIR)\helpwin.cpp
icon.obj: $(MSWDIR)\icon.cpp icon.obj: $(MSWDIR)\icon.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
imaglist.obj: $(MSWDIR)\imaglist.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
iniconf.obj: $(MSWDIR)\iniconf.cpp iniconf.obj: $(MSWDIR)\iniconf.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -435,6 +446,9 @@ joystick.obj: $(MSWDIR)\joystick.cpp
listbox.obj: $(MSWDIR)\listbox.cpp listbox.obj: $(MSWDIR)\listbox.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
listctrl.obj: $(MSWDIR)\listctrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
main.obj: $(MSWDIR)\main.cpp main.obj: $(MSWDIR)\main.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -459,6 +473,9 @@ msgdlg.obj: $(MSWDIR)\msgdlg.cpp
nativdlg.obj: $(MSWDIR)\nativdlg.cpp nativdlg.obj: $(MSWDIR)\nativdlg.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
notebook.obj: $(MSWDIR)\notebook.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
oleutils.obj: $(OLEDIR)\oleutils.cpp oleutils.obj: $(OLEDIR)\oleutils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@ -552,6 +569,9 @@ timer.obj: $(MSWDIR)\timer.cpp
tooltip.obj: $(MSWDIR)\tooltip.cpp tooltip.obj: $(MSWDIR)\tooltip.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
treectrl.obj: $(MSWDIR)\treectrl.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
utils.obj: $(MSWDIR)\utils.cpp utils.obj: $(MSWDIR)\utils.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<

View File

@ -315,7 +315,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
if ( m_windowStyle & wxTR_LINES_AT_ROOT ) if ( m_windowStyle & wxTR_LINES_AT_ROOT )
wstyle |= TVS_LINESATROOT; wstyle |= TVS_LINESATROOT;
#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS) #if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined( __WATCOMC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
// we emulate the multiple selection tree controls by using checkboxes: set // we emulate the multiple selection tree controls by using checkboxes: set
// up the image list we need for this if we do have multiple selections // up the image list we need for this if we do have multiple selections
#if !defined(__VISUALC__) || (__VISUALC__ > 1010) #if !defined(__VISUALC__) || (__VISUALC__ > 1010)

View File

@ -1,5 +1,5 @@
[OPTIONS] [OPTIONS]
BMROOT=d:\wx2\wxwind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is BMROOT=d:\wx2\wxWind~1\utils\tex2rtf\docs ; Assume that bitmaps are where the source is
TITLE=Tex2RTF Manual TITLE=Tex2RTF Manual
CONTENTS=Contents CONTENTS=Contents
COMPRESS=HIGH COMPRESS=HIGH

View File

@ -8,11 +8,11 @@
\parskip=10pt% \parskip=10pt%
\parindent=0pt% \parindent=0pt%
%\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only %\backgroundcolour{255;255;255}\textcolour{0;0;0}% Has an effect in HTML only
\winhelpignore{\title{Manual for Tex2RTF 1.64:\\A \LaTeX\ to RTF and HTML converter}% \winhelpignore{\title{Manual for Tex2RTF 2.0:\\A \LaTeX\ to RTF and HTML converter}%
\author{Julian Smart}% \author{Julian Smart}%
\date{October 1997}% \date{November 1999}%
}% }%
\winhelponly{\title{Manual for Tex2RTF 1.64}% \winhelponly{\title{Manual for Tex2RTF 2.0}%
\author{by Julian Smart\\$$\image{1cm;0cm}{tex2rtf.wmf}$$}% \author{by Julian Smart\\$$\image{1cm;0cm}{tex2rtf.wmf}$$}%
}% }%
\makeindex% \makeindex%
@ -84,24 +84,13 @@ C++ class library \popref{wxWindows}{wxwindows}.
\section{Status of Tex2RTF}\index{status of Tex2RTF}% \section{Status of Tex2RTF}\index{status of Tex2RTF}%
Tex2RTF is under continual development, often following users' Windows HTML help, and wxWindows 2 wxHTML help, are now catered for using
suggestions. From version 1.33, Tex2RTF is effectively in a second phase the htmlWorkshopFiles setting.
of development. In addition to the bare minimum of syntax and facilities
for producing useable help systems or linear RTF, commands are being
added to allow visually effective, even aesthetically pleasing,
documentation to be produced.
Examples are the \verb$\indented$, \verb$\twocollist$ and \verb$\marginpar$\rtfsp Tex2RTF is very rarely updated these days: it would be nice to
commands; over time I hope to be able to reproduce most of the popular rewrite the parser (and indeed the rest of it) at some point,
styles of formatting and presentation in Windows Help files, whilst to improve error reporting, space handling and ability to
allowing a reasonable equivalent to be generated in the other formats. handle more advanced Tex/Latex commands.
Some new developments in the various formats still need to be catered
for by Tex2RTF, such as Windows 95 help files and HTML 3.0. Features
that can be added to Tex2RTF as a result of these developments include
math and inline image map support in HTML, table support in Windows
Help, and generally better formatting abilities in both. However, documentation
about these formats is sketchy at the time of writing (October 1995).
\section{Acknowledgements}\index{acknowledgements}% \section{Acknowledgements}\index{acknowledgements}%
@ -111,7 +100,7 @@ a great help in giving advice for improvements to the manual.
\section{Change log}\index{change log}% \section{Change log}\index{change log}%
Version 1.65, August 24th 1999 Version 2.0, August 24th 1999
\begin{itemize}\itemsep=0pt \begin{itemize}\itemsep=0pt
\item Added htmlWorkshopFiles setting, to output .hpp, .hhc \item Added htmlWorkshopFiles setting, to output .hpp, .hhc