Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some doc corrections; Watcom C++ corrections; VC++ 4 corrections

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5875 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-06 19:11:10 +00:00
parent 46132182f0
commit 457e6c54a2
32 changed files with 350 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/msw/tmake/wat.t
View File

@@ -355,7 +355,7 @@ clean_zlib: .SYMBOLIC
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
MFTYPE=wat MFTYPE=wat
makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXWIN)\distrib\msw\tmake cd $(WXDIR)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw copy makefile.$(MFTYPE) $(WXDIR)\src\msw

10
docs/html/index.htm
View File

@@ -157,6 +157,8 @@ downloaded from the <a href="http://www.wxwindows.org">wxWindows Web site</a>.<P
<h3 align=center><a name="samples"><hr>Samples<hr></a></h3> <h3 align=center><a name="samples"><hr>Samples<hr></a></h3>
Each of the following demonstrates one or more aspect of wxWindows.<P>
<ul> <ul>
<li><a href="../../samples/calendar">calendar</a>: a sample to test the wxCalendarCtrl class. <li><a href="../../samples/calendar">calendar</a>: a sample to test the wxCalendarCtrl class.
<li><a href="../../samples/caret">caret</a>: a sample to test the wxCaret class. <li><a href="../../samples/caret">caret</a>: a sample to test the wxCaret class.
@@ -231,6 +233,8 @@ Excel to be present).
<li><a href="../../samples/resource">resource</a>: shows how to use wxWindows resources (.wxr files). <li><a href="../../samples/resource">resource</a>: shows how to use wxWindows resources (.wxr files).
<li><a href="../../samples/richedit">richedit</a>: a work-in-progress rich text editor with plain text and HTML export <li><a href="../../samples/richedit">richedit</a>: a work-in-progress rich text editor with plain text and HTML export
facilities. facilities.
<li><a href="../../samples/rotate">rotate</a>: demonstrates interpolated and non-interpolated
rotation of a wxImage.
<li><a href="../../samples/sashtest">sashtest</a>: demonstrates use of the wxSashWindow class to allow <li><a href="../../samples/sashtest">sashtest</a>: demonstrates use of the wxSashWindow class to allow
the user to resize subwindows. the user to resize subwindows.
<li><a href="../../samples/scroll">scroll</a>: demonstrates wxScrolledWindow. <li><a href="../../samples/scroll">scroll</a>: demonstrates wxScrolledWindow.
@@ -258,10 +262,12 @@ wxTime, wxDate and wxVariant.
<h3 align=center><a name="demos"><hr>Demos<hr></a></h3> <h3 align=center><a name="demos"><hr>Demos<hr></a></h3>
The following are fully-fledged applications.<P>
<ul> <ul>
<li><a href="../../demos/bombs">bombs</a>: minesweeper-like game. <li><a href="../../demos/bombs">bombs</a>: minesweeper-like game.
<li><a href="../../demos/forty">forty</a>: a great little card game by Chris Breeze. A <li><a href="../../demos/dbbrowse">dbbrowse</a>: ODBC database browser application.
fully-fledged application! <li><a href="../../demos/forty">forty</a>: a great little card game by Chris Breeze.
<li><a href="../../demos/fractal">fractal</a>: fractal mountains by Andrew Davison. <li><a href="../../demos/fractal">fractal</a>: fractal mountains by Andrew Davison.
<li><a href="../../demos/life">life</a>: the game of Life by J. H. Conway, implemented in wxWindows by Guillermo Rodriguez Garcia. <li><a href="../../demos/life">life</a>: the game of Life by J. H. Conway, implemented in wxWindows by Guillermo Rodriguez Garcia.
<li><a href="../../demos/poem">poem</a>: a little poetry display program. <li><a href="../../demos/poem">poem</a>: a little poetry display program.

1
docs/latex/wx/calctrl.tex
View File

@@ -20,3 +20,4 @@ The calendar control allows the user to pick a date interactively.
\wxheading{See also:} \wxheading{See also:}
\helpref{Calendar sample}{samplecalendar} \helpref{Calendar sample}{samplecalendar}

1
docs/latex/wx/droptrgt.tex
View File

@@ -142,3 +142,4 @@ Called when the mouse leaves the drop target.
Sets the data \helpref{wxDataObject}{wxdataobject} associated with the Sets the data \helpref{wxDataObject}{wxdataobject} associated with the
drop target and deletes any previously associated data object. drop target and deletes any previously associated data object.

33
docs/latex/wx/encconv.tex
View File

@@ -3,22 +3,18 @@
% encconv.h at 30/Dec/99 18:45:16 % encconv.h at 30/Dec/99 18:45:16
% %
\section{\class{wxEncodingConverter}}\label{wxencodingconverter} \section{\class{wxEncodingConverter}}\label{wxencodingconverter}
This class is capable of converting strings between any two This class is capable of converting strings between any two
8bit encodings/charsets. It can also convert from/to Unicode (but only 8-bit encodings/charsets. It can also convert from/to Unicode (but only
if you compiled wxWindows with wxUSE_UNICODE set to 1). if you compiled wxWindows with wxUSE_UNICODE set to 1).
\wxheading{Derived from} \wxheading{Derived from}
\helpref{wxObject}{wxobject} \helpref{wxObject}{wxobject}
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxEncodingConverter::wxEncodingConverter}\label{wxencodingconverterwxencodingconverter} \membersection{wxEncodingConverter::wxEncodingConverter}\label{wxencodingconverterwxencodingconverter}
\func{}{wxEncodingConverter}{\void} \func{}{wxEncodingConverter}{\void}
@@ -32,7 +28,7 @@ Constructor.
Initialize convertion. Both output or input encoding may Initialize convertion. Both output or input encoding may
be wxFONTENCODING\_UNICODE, but only if wxUSE\_ENCODING is set to 1. be wxFONTENCODING\_UNICODE, but only if wxUSE\_ENCODING is set to 1.
All subsequent calls to \helpref{Convert()}{wxencodingconverterconvert} All subsequent calls to \helpref{Convert()}{wxencodingconverterconvert}
will interpret it's argument will interpret its argument
as a string in {\it input\_enc} encoding and will output string in as a string in {\it input\_enc} encoding and will output string in
{\it output\_enc} encoding. {\it output\_enc} encoding.
You must call this method before calling Convert. You may call You must call this method before calling Convert. You may call
@@ -40,7 +36,7 @@ it more than once in order to switch to another conversion.
{\it Method} affects behaviour of Convert() in case input character {\it Method} affects behaviour of Convert() in case input character
cannot be converted because it does not exist in output encoding: cannot be converted because it does not exist in output encoding:
\begin{twocollist} \begin{twocollist}\itemsep=0pt
\twocolitem{{\bf wxCONVERT\_STRICT}}{follow behaviour of GNU Recode - \twocolitem{{\bf wxCONVERT\_STRICT}}{follow behaviour of GNU Recode -
just copy unconvertable characters to output and don't change them just copy unconvertable characters to output and don't change them
(its integer value will stay the same)} (its integer value will stay the same)}
@@ -59,7 +55,6 @@ FALSE if given conversion is impossible, TRUE otherwise
to Unicode with non-Unicode build of wxWindows or if input to Unicode with non-Unicode build of wxWindows or if input
or output encoding is not supported.) or output encoding is not supported.)
\membersection{wxEncodingConverter::Convert}\label{wxencodingconverterconvert} \membersection{wxEncodingConverter::Convert}\label{wxencodingconverterconvert}
\func{wxString}{Convert}{\param{const wxString\& }{input}} \func{wxString}{Convert}{\param{const wxString\& }{input}}
@@ -73,8 +68,6 @@ or output encoding is not supported.)
Convert input string according to settings passed to \helpref{Init}{wxencodingconverterinit}. Convert input string according to settings passed to \helpref{Init}{wxencodingconverterinit}.
Note that you must call Init before using Convert! Note that you must call Init before using Convert!
\membersection{wxEncodingConverter::GetPlatformEquivalents}\label{wxencodingconvertergetplatformequivalents} \membersection{wxEncodingConverter::GetPlatformEquivalents}\label{wxencodingconvertergetplatformequivalents}
\func{static wxFontEncodingArray}{GetPlatformEquivalents}{\param{wxFontEncoding }{enc}, \param{int }{platform = wxPLATFORM\_CURRENT}} \func{static wxFontEncodingArray}{GetPlatformEquivalents}{\param{wxFontEncoding }{enc}, \param{int }{platform = wxPLATFORM\_CURRENT}}
@@ -82,7 +75,7 @@ Note that you must call Init before using Convert!
Return equivalents for given font that are used Return equivalents for given font that are used
under given platform. Supported platforms: under given platform. Supported platforms:
\begin{itemize} \begin{itemize}\itemsep=0pt
\item wxPLATFORM\_UNIX \item wxPLATFORM\_UNIX
\item wxPLATFORM\_WINDOWS \item wxPLATFORM\_WINDOWS
\item wxPLATFORM\_OS2 \item wxPLATFORM\_OS2
@@ -93,6 +86,7 @@ under given platform. Supported platforms:
wxPLATFORM\_CURRENT means the plaform this binary was compiled for. wxPLATFORM\_CURRENT means the plaform this binary was compiled for.
Examples: Examples:
\begin{verbatim} \begin{verbatim}
current platform enc returned value current platform enc returned value
---------------------------------------------- ----------------------------------------------
@@ -115,22 +109,18 @@ encodings. (It usually returns only one encoding.)
\wxheading{Notes} \wxheading{Notes}
\begin{itemize} \begin{itemize}\itemsep=0pt
\item Note that argument {\it enc} itself may be present in returned array! \item Note that argument {\it enc} itself may be present in the returned array,
(So that you can - as a side effect - detect whether the so that you can - as a side effect - detect whether the
encoding is native for this platform or not.) encoding is native for this platform or not.
\item helpref{Convert}{wxencodingconverterconvert} is not limited to \item helpref{Convert}{wxencodingconverterconvert} is not limited to
converting between equivalent encodings, it can convert between arbitrary converting between equivalent encodings, it can convert between arbitrary
two encodings! two encodings.
\item If {\it enc} is present in returned array, then it is {\bf always} first \item If {\it enc} is present in returned array, then it is {\bf always} first
item of it. item of it.
\item Please note that the returned array may not contain any items at all.
\item Please not that returned array may not contain any item at all!
\end{itemize} \end{itemize}
\membersection{wxEncodingConverter::GetAllEquivalents}\label{wxencodingconvertergetallequivalents} \membersection{wxEncodingConverter::GetAllEquivalents}\label{wxencodingconvertergetallequivalents}
\func{static wxFontEncodingArray}{GetAllEquivalents}{\param{wxFontEncoding }{enc}} \func{static wxFontEncodingArray}{GetAllEquivalents}{\param{wxFontEncoding }{enc}}
@@ -142,3 +132,4 @@ equivalent encodings, regardless the platform, and including itself.
This platform's encodings are before others in the array. And again, if {\it enc} is in the array, This platform's encodings are before others in the array. And again, if {\it enc} is in the array,
it is the very first item in it. it is the very first item in it.

44
docs/latex/wx/hthlpfrm.tex
View File

@@ -3,14 +3,12 @@
% helpfrm.h at 24/Oct/99 18:03:10 % helpfrm.h at 24/Oct/99 18:03:10
% %
\section{\class{wxHtmlHelpFrame}}\label{wxhtmlhelpframe} \section{\class{wxHtmlHelpFrame}}\label{wxhtmlhelpframe}
This class is used by \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} This class is used by \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller}
to display help. to display help.
It is internal class and should not be used directly - except for the case It is an internal class and should not be used directly - except for the case
you're writing your own HTML help controller. when you're writing your own HTML help controller.
\wxheading{Derived from} \wxheading{Derived from}
@@ -18,8 +16,6 @@ you're writing your own HTML help controller.
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxHtmlHelpFrame::wxHtmlHelpFrame}\label{wxhtmlhelpframewxhtmlhelpframe} \membersection{wxHtmlHelpFrame::wxHtmlHelpFrame}\label{wxhtmlhelpframewxhtmlhelpframe}
\func{}{wxHtmlHelpFrame}{\param{wxHtmlHelpData* }{data = NULL}} \func{}{wxHtmlHelpFrame}{\param{wxHtmlHelpData* }{data = NULL}}
@@ -30,7 +26,7 @@ Constructor.
{\it style} is combination of these flags: {\it style} is combination of these flags:
\begin{twocollist} \begin{twocollist}\itemsep=0pt
\twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.} \twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.}
\twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.} \twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.}
\twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.} \twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.}
@@ -40,7 +36,6 @@ Constructor.
\twocolitem{\windowstyle{wxHF\_PRINT}}{Toolbar contains "print" button.} \twocolitem{\windowstyle{wxHF\_PRINT}}{Toolbar contains "print" button.}
\end{twocollist} \end{twocollist}
\membersection{wxHtmlHelpFrame::Create}\label{wxhtmlhelpframecreate} \membersection{wxHtmlHelpFrame::Create}\label{wxhtmlhelpframecreate}
\func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULTSTYLE}} \func{bool}{Create}{\param{wxWindow* }{parent}, \param{wxWindowID }{id}, \param{const wxString\& }{title = wxEmptyString}, \param{int }{style = wxHF\_DEFAULTSTYLE}}
@@ -49,49 +44,47 @@ Creates the frame.
{\it style} is combination of these flags: {\it style} is combination of these flags:
\begin{twocollist} \begin{twocollist}\itemsep=0pt
\twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.} \twocolitem{\windowstyle{wxHF\_TOOLBAR}}{Help frame has toolbar.}
\twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.} \twocolitem{\windowstyle{wxHF\_CONTENTS}}{Help frame has contents panel.}
\twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.} \twocolitem{\windowstyle{wxHF\_INDEX}}{Help frame has index panel.}
\twocolitem{\windowstyle{wxHF\_SEARCH}}{Help frame has search panel.} \twocolitem{\windowstyle{wxHF\_SEARCH}}{Help frame has search panel.}
\end{twocollist} \end{twocollist}
\membersection{wxHtmlHelpFrame::CreateContents}\label{wxhtmlhelpframecreatecontents} \membersection{wxHtmlHelpFrame::CreateContents}\label{wxhtmlhelpframecreatecontents}
\func{void}{CreateContents}{\param{bool }{show\_progress = FALSE}} \func{void}{CreateContents}{\param{bool }{show\_progress = FALSE}}
Creates contents panel. (May take some time.) Creates contents panel. (May take some time.)
\membersection{wxHtmlHelpFrame::CreateIndex}\label{wxhtmlhelpframecreateindex} \membersection{wxHtmlHelpFrame::CreateIndex}\label{wxhtmlhelpframecreateindex}
\func{void}{CreateIndex}{\param{bool }{show\_progress = FALSE}} \func{void}{CreateIndex}{\param{bool }{show\_progress = FALSE}}
Creates index panel. (May take some time.) Creates index panel. (May take some time.)
\membersection{wxHtmlHelpFrame::CreateSearch}\label{wxhtmlhelpframecreatesearch} \membersection{wxHtmlHelpFrame::CreateSearch}\label{wxhtmlhelpframecreatesearch}
\func{void}{CreateSearch}{\void} \func{void}{CreateSearch}{\void}
Creates search panel. Creates search panel.
\membersection{wxHtmlHelpFrame::Display}\label{wxhtmlhelpframedisplay} \membersection{wxHtmlHelpFrame::Display}\label{wxhtmlhelpframedisplay}
\func{bool}{Display}{\param{const wxString\& }{x}} \func{bool}{Display}{\param{const wxString\& }{x}}
\func{bool}{Display}{\param{const int }{id}} \func{bool}{Display}{\param{const int }{id}}
Displays page x. If not found it will offect the user a choice of Displays page x. If not found it will give the user the choice of
searching books. searching books.
Looking for the page runs in these steps: Looking for the page runs in these steps:
1. try to locate file named x (if x is for example "doc/howto.htm")
2. try to open starting page of book x \begin{enumerate}\itemsep=0pt
3. try to find x in contents (if x is for example "How To ...") \item try to locate file named x (if x is for example "doc/howto.htm")
4. try to find x in index (if x is for example "How To ...") \item try to open starting page of book x
\item try to find x in contents (if x is for example "How To ...")
\item try to find x in index (if x is for example "How To ...")
\end{enumerate}
The second form takes numeric ID as the parameter. The second form takes numeric ID as the parameter.
(uses extension to MS format, <param name="ID" value=id>) (uses extension to MS format, <param name="ID" value=id>)
@@ -111,7 +104,6 @@ Displays contents panel.
Displays index panel. Displays index panel.
\membersection{wxHtmlHelpFrame::GetData}\label{wxhtmlhelpframegetdata} \membersection{wxHtmlHelpFrame::GetData}\label{wxhtmlhelpframegetdata}
\func{wxHtmlHelpData*}{GetData}{\void} \func{wxHtmlHelpData*}{GetData}{\void}
@@ -124,7 +116,6 @@ Return wxHtmlHelpData object.
Search for given keyword. Search for given keyword.
\membersection{wxHtmlHelpFrame::ReadCustomization}\label{wxhtmlhelpframereadcustomization} \membersection{wxHtmlHelpFrame::ReadCustomization}\label{wxhtmlhelpframereadcustomization}
\func{void}{ReadCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}} \func{void}{ReadCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}}
@@ -135,7 +126,7 @@ Reads user's settings for this frame (see \helpref{wxHtmlHelpController::ReadCus
\func{void}{RefreshLists}{\param{bool }{show\_progress = FALSE}} \func{void}{RefreshLists}{\param{bool }{show\_progress = FALSE}}
Refresh all panels. This is neccessary if new book was added. Refresh all panels. This is necessary if new book was added.
\membersection{wxHtmlHelpFrame::SetTitleFormat}\label{wxhtmlhelpframesettitleformat} \membersection{wxHtmlHelpFrame::SetTitleFormat}\label{wxhtmlhelpframesettitleformat}
@@ -148,24 +139,23 @@ Sets frame's title format. {\it format} must contain exactly one "\%s"
\func{void}{UseConfig}{\param{wxConfigBase* }{config}, \param{const wxString\& }{rootpath = wxEmptyString}} \func{void}{UseConfig}{\param{wxConfigBase* }{config}, \param{const wxString\& }{rootpath = wxEmptyString}}
Add books to search choice panel Add books to search choice panel.
\membersection{wxHtmlHelpFrame::WriteCustomization}\label{wxhtmlhelpframewritecustomization} \membersection{wxHtmlHelpFrame::WriteCustomization}\label{wxhtmlhelpframewritecustomization}
\func{void}{WriteCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}} \func{void}{WriteCustomization}{\param{wxConfigBase* }{cfg}, \param{const wxString\& }{path = wxEmptyString}}
Saves user's settings for this frame (see \helpref{wxHtmlHelpController::WriteCustomization}{wxhtmlhelpcontrollerwritecustomization}) Saves user's settings for this frame (see \helpref{wxHtmlHelpController::WriteCustomization}{wxhtmlhelpcontrollerwritecustomization}).
\membersection{wxHtmlHelpFrame::AddToolbarButtons}\label{wxhtmlhelpframeaddtoolbarbuttons} \membersection{wxHtmlHelpFrame::AddToolbarButtons}\label{wxhtmlhelpframeaddtoolbarbuttons}
\func{virtual void}{AddToolbarButtons}{\param{wxToolBar *}{toolBar}, \param{int }{style}} \func{virtual void}{AddToolbarButtons}{\param{wxToolBar *}{toolBar}, \param{int }{style}}
You may override this virtual method to add more buttons into help frame's You may override this virtual method to add more buttons into help frame's
toolbar. {\it toolBar} is pointer to the toolbar and {\it style} is style toolbar. {\it toolBar} is a pointer to the toolbar and {\it style} is the style
flag as passed to Create method. flag as passed to Create method.
wxToolBar::Realize is called immediately after returning from this function. wxToolBar::Realize is called immediately after returning from this function.
See {\it samples/html/helpview} for an example. See {\it samples/html/helpview} for an example.

3
docs/latex/wx/htmlhlpf.tex
View File

@@ -32,8 +32,7 @@ which specifies what charset (e.g. "iso8859_1") was used in contents
and index files. Please note that this line is incompatible with and index files. Please note that this line is incompatible with
MS HTML Help Workshop and it would either silently remove it or complain MS HTML Help Workshop and it would either silently remove it or complain
with some error. See also with some error. See also
\helpref{Writing non-English applications.}{nonenglishoverview} \helpref{Writing non-English applications}{nonenglishoverview}.
\wxheading{Contents file (.hhc)} \wxheading{Contents file (.hhc)}

2
docs/latex/wx/ipvaddr.tex
View File

@@ -100,7 +100,6 @@ to {\bf INADDR\_ANY}.
Returns TRUE on success, FALSE if something went wrong. Returns TRUE on success, FALSE if something went wrong.
% %
% LocalHost % LocalHost
% %
@@ -117,3 +116,4 @@ hosts and avoid other small problems.
\wxheading{Return value} \wxheading{Return value}
Returns TRUE on success, FALSE if something went wrong. Returns TRUE on success, FALSE if something went wrong.

5
docs/latex/wx/manual.tex
View File

@@ -148,7 +148,6 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
If you do not wish that, you must delete the exception notice from such If you do not wish that, you must delete the exception notice from such
code and/or adjust the licensing conditions notice accordingly. code and/or adjust the licensing conditions notice accordingly.
\section*{GNU Library General Public License, Version 2} \section*{GNU Library General Public License, Version 2}
Copyright (C) 1991 Free Software Foundation, Inc. Copyright (C) 1991 Free Software Foundation, Inc.
@@ -425,7 +424,6 @@ copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License. Also, you must do one directing the user to the copy of this License. Also, you must do one
of these things: of these things:
\begin{indented}{1cm} \begin{indented}{1cm}
a) Accompany the work with the complete corresponding a) Accompany the work with the complete corresponding
machine-readable source code for the Library including whatever machine-readable source code for the Library including whatever
@@ -635,7 +633,6 @@ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
\end{verbatim} \end{verbatim}
} }
Also add information on how to contact you by electronic and paper mail. Also add information on how to contact you by electronic and paper mail.
You should also get your employer (if you work as a programmer) or your You should also get your employer (if you work as a programmer) or your
@@ -652,10 +649,8 @@ Ty Coon, President of Vice
\end{verbatim} \end{verbatim}
} }
That's all there is to it! That's all there is to it!
\input{body.tex} \input{body.tex}
\input{classes.tex} \input{classes.tex}
\input{category.tex} \input{category.tex}

1
docs/latex/wx/outptstr.tex
View File

@@ -112,3 +112,4 @@ Destructor.
\constfunc{size\_t}{GetSize}{\void} \constfunc{size\_t}{GetSize}{\void}
Returns the current size of the stream. Returns the current size of the stream.

1
docs/latex/wx/sckaddr.tex
View File

@@ -55,3 +55,4 @@ Delete all informations about the address.
\func{int}{SockAddrLen}{\void} \func{int}{SockAddrLen}{\void}
Returns the length of the socket address. Returns the length of the socket address.

BIN
docs/latex/wx/splitter.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

1
docs/latex/wx/tfile.tex
View File

@@ -28,3 +28,4 @@ native" line termination characters and write them as "native" files if needed
wxDir is a helper class for enumerating the files or subdirectories of a wxDir is a helper class for enumerating the files or subdirectories of a
directory. It may be used to enumerate all files, only files satisfying the directory. It may be used to enumerate all files, only files satisfying the
given template mask or only non-hidden files. given template mask or only non-hidden files.

1
docs/latex/wx/thread.tex
View File

@@ -309,3 +309,4 @@ Waits until the thread terminates and returns its exit code or {\tt
You can only Wait() for joinable (not detached) threads. You can only Wait() for joinable (not detached) threads.
This function can only be called from another thread context. This function can only be called from another thread context.

19
docs/latex/wx/timer.tex
View File

@@ -34,7 +34,7 @@ be stopped later with \helpref{Stop}{wxtimerstop}.
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxTimer::wxTimer}{wxtimerctordef} \membersection{wxTimer::wxTimer}\label{wxtimerctordef}
\func{}{wxTimer}{\void} \func{}{wxTimer}{\void}
@@ -42,7 +42,7 @@ Default constructor. If you use it to construct the object and don't call
\helpref{SetOwner}{wxtimersetowner} later, you must override \helpref{SetOwner}{wxtimersetowner} later, you must override
\helpref{Notify}{wxtimernotify} method to process the notifications. \helpref{Notify}{wxtimernotify} method to process the notifications.
\membersection{wxTimer::wxTimer}{wxtimerwxtimer} \membersection{wxTimer::wxTimer}\label{wxtimerwxtimer}
\func{}{wxTimer}{\param{wxEvtHandler *}{owner}, \param{int }{id = -1}} \func{}{wxTimer}{\param{wxEvtHandler *}{owner}, \param{int }{id = -1}}
@@ -61,20 +61,20 @@ Destructor. Stops the timer if it is running.
Returns the current interval for the timer (in milliseconds). Returns the current interval for the timer (in milliseconds).
\membersection{wxTimer::IsOneShot}{wxtimerisoneshot} \membersection{wxTimer::IsOneShot}\label{wxtimerisoneshot}
\constfunc{bool}{IsOneShot}{\void} \constfunc{bool}{IsOneShot}{\void}
Returns TRUE if the timer is one shot, i.e. if it will stop after firing the Returns TRUE if the timer is one shot, i.e. if it will stop after firing the
first notification automatically. first notification automatically.
\membersection{wxTimer::IsRunning}{wxtimerisrunning} \membersection{wxTimer::IsRunning}\label{wxtimerisrunning}
\constfunc{bool}{IsRunning}{\void} \constfunc{bool}{IsRunning}{\void}
Returns TRUE if the timer is running, FALSE if it is stopped. Returns TRUE if the timer is running, FALSE if it is stopped.
\membersection{wxTimer::Notify}{wxtimernotify} \membersection{wxTimer::Notify}\label{wxtimernotify}
\func{void}{Notify}{\void} \func{void}{Notify}{\void}
@@ -83,7 +83,7 @@ used and \helpref{SetOwner}{wxtimersetowner} wasn't called.
Perform whatever action which is to be taken periodically here. Perform whatever action which is to be taken periodically here.
\membersection{wxTimer::SetOwner}{wxtimersetowner} \membersection{wxTimer::SetOwner}\label{wxtimersetowner}
\func{void}{SetOwner}{\param{wxEvtHandler *}{owner}, \param{int }{id = -1}} \func{void}{SetOwner}{\param{wxEvtHandler *}{owner}, \param{int }{id = -1}}
@@ -91,7 +91,7 @@ Associates the timer with the given {\it owner} object. When the timer is
running, the owner will receive \helpref{timer events}{wxtimerevent} with running, the owner will receive \helpref{timer events}{wxtimerevent} with
id equal to {\it id} specified here. id equal to {\it id} specified here.
\membersection{wxTimer::Start}{wxtimerstart} \membersection{wxTimer::Start}\label{wxtimerstart}
\func{bool}{Start}{\param{int}{ milliseconds = -1}, \param{bool}{ oneShot=FALSE}} \func{bool}{Start}{\param{int}{ milliseconds = -1}, \param{bool}{ oneShot=FALSE}}
@@ -103,7 +103,7 @@ If {\it oneShot} is FALSE (the default), the \helpref{Notify}{wxtimernotify}
function will be called repeatedly until the timer is stopped. If TRUE, function will be called repeatedly until the timer is stopped. If TRUE,
it will be called only once and the timer will stop automatically. it will be called only once and the timer will stop automatically.
\membersection{wxTimer::Stop}{wxtimerstop} \membersection{wxTimer::Stop}\label{wxtimerstop}
\func{void}{Stop}{\void} \func{void}{Stop}{\void}
@@ -153,7 +153,7 @@ void MyFrame::OnTimer(wxTimerEvent& event)
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
\membersection{wxTimerEvent::GetInterval}{wxtimereventgetinterval} \membersection{wxTimerEvent::GetInterval}\label{wxtimereventgetinterval}
\constfunc{int}{GetInterval}{\void} \constfunc{int}{GetInterval}{\void}
@@ -204,3 +204,4 @@ Resumes the stop watch after having been paused with \helpref{wxStopWatch::Pause
Returns the time in milliseconds since the start (or restart) or the last call of Returns the time in milliseconds since the start (or restart) or the last call of
\helpref{wxStopWatch::Pause}{wxstopwatchpause}. \helpref{wxStopWatch::Pause}{wxstopwatchpause}.

8
docs/latex/wx/tnoneng.tex
View File

@@ -17,7 +17,6 @@ describes locales concept.
Whereever in the following text {\it iso8859-2} and {\it windows-1250} are Whereever in the following text {\it iso8859-2} and {\it windows-1250} are
used, any encodings are meant and any encodings may be substituted there. used, any encodings are meant and any encodings may be substituted there.
\wxheading{Locales} \wxheading{Locales}
The best way how to ensure correctly displayed texts in GUI across platforms The best way how to ensure correctly displayed texts in GUI across platforms
@@ -96,8 +95,6 @@ You must set {\it bConvertEncoding} to TRUE in
\helpref{wxLocale constructor}{wxlocaledefctor} in order to enable \helpref{wxLocale constructor}{wxlocaledefctor} in order to enable
runtime encoding conversion! runtime encoding conversion!
\wxheading{Font mapping} \wxheading{Font mapping}
You can use \helpref{wxEncodingConverter}{wxencodingconverter} and You can use \helpref{wxEncodingConverter}{wxencodingconverter} and
@@ -122,16 +119,12 @@ if (!wxTheFontMapper->IsEncodingAvailable(enc, facename))
...display text... ...display text...
\end{verbatim} \end{verbatim}
\wxheading{Converting data} \wxheading{Converting data}
You may want to store all program data (created documents etc.) in You may want to store all program data (created documents etc.) in
same encoding, let's say windows1250. Obviously, the best way would same encoding, let's say windows1250. Obviously, the best way would
be to use \helpref{wxEncodingConverter}{wxencodingconverter}. be to use \helpref{wxEncodingConverter}{wxencodingconverter}.
\wxheading{Help files} \wxheading{Help files}
If you're using \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} there is If you're using \helpref{wxHtmlHelpController}{wxhtmlhelpcontroller} there is
@@ -151,3 +144,4 @@ Charset=iso8859-2
This additional entry tells HTML help controller what encoding is used This additional entry tells HTML help controller what encoding is used
in contents and index tables. in contents and index tables.

19
docs/msw/install.txt
View File

@@ -282,9 +282,22 @@ Note (1): setup.h overrides wxUSE_LIBJPEG and sets it to 0, since
imagjpeg.cpp doesn't compile. imagjpeg.cpp doesn't compile.
Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom Note (2): makewat.env uses the odbc32.lib supplied in wxWindows' lib\watcom
directory. See the notes in that directory. directory. See the notes in that directory.
Note (3): makefile compilation seems broken (28/12/99) with a Note (3): if variant.cpp is compiled with date/time class
GPF in the linker. Too many object files? Could try switching options, the linker gives up. So the date/time option is switched
some options off in setup.h. off for Watcom C++. Also, wxAutomationObject is not compiled with
Watcom C++.
Note (4): if Watcom can't read the precompiled header when
building a sample, try deleting src\msw\watcom.pch and
compiling the sample again.
Note (5): if you get _popen_ and _pclose_ link errors, try
recompiling wxWindows with XPM support disabled in setup.h.
Alternatively, make sure these lines exist at the top of
src\xpm\xpmi.h:
// Added by JACS for Watcom C++/wxWindows compilation (no popen/pclose functions)
#ifdef __WATCOMC__
#define NO_ZPIPE
#endif
Metrowerks CodeWarrior compilation Metrowerks CodeWarrior compilation
---------------------------------- ----------------------------------

14
include/wx/calctrl.h
View File

@@ -152,11 +152,13 @@ private:
// calendar events macros // calendar events macros
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#define EVT_CALENDAR(id, fn) { wxEVT_CALENDAR_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, typedef void (wxEvtHandler::*wxCalendarEventFunction)(wxCalendarEvent&);
#define EVT_CALENDAR_SEL_CHANGED(id, fn) { wxEVT_CALENDAR_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_DAY(id, fn) { wxEVT_CALENDAR_DAY_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_CALENDAR(id, fn) { wxEVT_CALENDAR_DOUBLECLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_MONTH(id, fn) { wxEVT_CALENDAR_MONTH_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_CALENDAR_SEL_CHANGED(id, fn) { wxEVT_CALENDAR_SEL_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_YEAR(id, fn) { wxEVT_CALENDAR_YEAR_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_CALENDAR_DAY(id, fn) { wxEVT_CALENDAR_DAY_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_WEEKDAY_CLICKED(id, fn) { wxEVT_CALENDAR_WEEKDAY_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) & fn, (wxObject *) NULL }, #define EVT_CALENDAR_MONTH(id, fn) { wxEVT_CALENDAR_MONTH_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_YEAR(id, fn) { wxEVT_CALENDAR_YEAR_CHANGED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#define EVT_CALENDAR_WEEKDAY_CLICKED(id, fn) { wxEVT_CALENDAR_WEEKDAY_CLICKED, id, -1, (wxObjectEventFunction) (wxEventFunction) (wxCommandEventFunction) (wxCalendarEventFunction) & fn, (wxObject *) NULL },
#endif // _WX_CALCTRL_H #endif // _WX_CALCTRL_H

16
include/wx/variant.h
View File

@@ -91,7 +91,8 @@ public:
wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool! wxVariant(const wxChar* val, const wxString& name = wxEmptyString); // Necessary or VC++ assumes bool!
wxVariant(const wxStringList& val, const wxString& name = wxEmptyString); wxVariant(const wxStringList& val, const wxString& name = wxEmptyString);
wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants wxVariant(const wxList& val, const wxString& name = wxEmptyString); // List of variants
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxVariant(const wxTime& val, const wxString& name = wxEmptyString); // Time wxVariant(const wxTime& val, const wxString& name = wxEmptyString); // Time
wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date wxVariant(const wxDate& val, const wxString& name = wxEmptyString); // Date
#endif #endif
@@ -135,7 +136,8 @@ public:
bool operator== (const wxList& value) const; bool operator== (const wxList& value) const;
bool operator!= (const wxList& value) const; bool operator!= (const wxList& value) const;
void operator= (const wxList& value) ; void operator= (const wxList& value) ;
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool operator== (const wxTime& value) const; bool operator== (const wxTime& value) const;
bool operator!= (const wxTime& value) const; bool operator!= (const wxTime& value) const;
void operator= (const wxTime& value) ; void operator= (const wxTime& value) ;
@@ -160,7 +162,8 @@ public:
inline operator char () const { return GetChar(); } inline operator char () const { return GetChar(); }
inline operator long () const { return GetLong(); } inline operator long () const { return GetLong(); }
inline operator bool () const { return GetBool(); } inline operator bool () const { return GetBool(); }
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
inline operator wxTime () const { return GetTime(); } inline operator wxTime () const { return GetTime(); }
inline operator wxDate () const { return GetDate(); } inline operator wxDate () const { return GetDate(); }
#endif #endif
@@ -196,7 +199,9 @@ public:
wxString GetString() const ; wxString GetString() const ;
wxList& GetList() const ; wxList& GetList() const ;
wxStringList& GetStringList() const ; wxStringList& GetStringList() const ;
#if wxUSE_TIMEDATE
// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxTime GetTime() const ; wxTime GetTime() const ;
wxDate GetDate() const ; wxDate GetDate() const ;
#endif #endif
@@ -232,7 +237,8 @@ protected:
bool Convert(double* value) const; bool Convert(double* value) const;
bool Convert(wxString* value) const; bool Convert(wxString* value) const;
bool Convert(char* value) const; bool Convert(char* value) const;
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool Convert(wxTime* value) const; bool Convert(wxTime* value) const;
bool Convert(wxDate* value) const; bool Convert(wxDate* value) const;
#endif #endif

4
samples/controls/controls.cpp
View File

@@ -105,7 +105,7 @@ public:
#endif // wxUSE_SPINBTN #endif // wxUSE_SPINBTN
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
void OnSpinCtrl(wxCommandEvent& event); void OnSpinCtrl(wxSpinEvent& event);
#endif // wxUSE_SPINCTRL #endif // wxUSE_SPINCTRL
void OnEnableAll(wxCommandEvent& event); void OnEnableAll(wxCommandEvent& event);
@@ -1066,7 +1066,7 @@ void MyPanel::OnSliderUpdate( wxCommandEvent &WXUNUSED(event) )
#if wxUSE_SPINCTRL #if wxUSE_SPINCTRL
void MyPanel::OnSpinCtrl(wxCommandEvent& event) void MyPanel::OnSpinCtrl(wxSpinEvent& event)
{ {
wxString s; wxString s;
s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"), s.Printf(_T("Spin ctrl changed: now %d (from event: %d)\n"),

4
samples/makefile.b32
View File

@@ -83,6 +83,8 @@ all:
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\rotate
make -f makefile.b32 FINAL=$(FINAL)
cd $(WXDIR)\samples\dde cd $(WXDIR)\samples\dde
make -f makefile.b32 FINAL=$(FINAL) make -f makefile.b32 FINAL=$(FINAL)
# cd $(WXDIR)\samples\regtest # cd $(WXDIR)\samples\regtest
@@ -153,6 +155,8 @@ clean:
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\image cd $(WXDIR)\samples\image
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples\rotate
make -f makefile.b32 clean
cd $(WXDIR)\samples\dde cd $(WXDIR)\samples\dde
make -f makefile.b32 clean make -f makefile.b32 clean
cd $(WXDIR)\samples cd $(WXDIR)\samples

4
samples/makefile.dos
View File

@@ -74,8 +74,6 @@ all:
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
!endif !endif
cd $(WXDIR)\samples\image
nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
nmake -f makefile.dos FINAL=$(FINAL) nmake -f makefile.dos FINAL=$(FINAL)
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest
@@ -205,8 +203,6 @@ clean:
cd $(WXDIR)\samples\html cd $(WXDIR)\samples\html
nmake -f makefile.dos clean nmake -f makefile.dos clean
!endif !endif
cd $(WXDIR)\samples\image
nmake -f makefile.dos clean
cd $(WXDIR)\samples\internat cd $(WXDIR)\samples\internat
nmake -f makefile.dos clean nmake -f makefile.dos clean
cd $(WXDIR)\samples\joytest cd $(WXDIR)\samples\joytest

1
samples/makefile.g95
View File

@@ -62,6 +62,7 @@ all clean:
-$(MAKE) -C regtest -f $(MAKEFILE) $@ -$(MAKE) -C regtest -f $(MAKEFILE) $@
-$(MAKE) -C resource -f $(MAKEFILE) $@ -$(MAKE) -C resource -f $(MAKEFILE) $@
-$(MAKE) -C richedit -f $(MAKEFILE) $@ -$(MAKE) -C richedit -f $(MAKEFILE) $@
-$(MAKE) -C rotate -f $(MAKEFILE) $@
-$(MAKE) -C sashtest -f $(MAKEFILE) $@ -$(MAKE) -C sashtest -f $(MAKEFILE) $@
-$(MAKE) -C scroll -f $(MAKEFILE) $@ -$(MAKE) -C scroll -f $(MAKEFILE) $@
-$(MAKE) -C scrollsub -f $(MAKEFILE) $@ -$(MAKE) -C scrollsub -f $(MAKEFILE) $@

4
samples/makefile.vc
View File

@@ -124,6 +124,8 @@ all:
cd $(WXDIR)\samples\richedit cd $(WXDIR)\samples\richedit
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
!endif !endif
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc FINAL=$(FINAL) nmake -f makefile.vc FINAL=$(FINAL)
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll
@@ -236,6 +238,8 @@ clean:
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\richedit cd $(WXDIR)\samples\richedit
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\rotate
nmake -f makefile.vc clean
cd $(WXDIR)\samples\sashtest cd $(WXDIR)\samples\sashtest
nmake -f makefile.vc clean nmake -f makefile.vc clean
cd $(WXDIR)\samples\scroll cd $(WXDIR)\samples\scroll

6
src/common/image.cpp
View File

@@ -2749,7 +2749,7 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
// First, find rectangle that covers the rotated image; to do that, // First, find rectangle that covers the rotated image; to do that,
// rotate the four corners // rotate the four corners
const wxRotationPoint & p0 = centre_of_rotation; const wxRotationPoint p0 = centre_of_rotation;
wxRotationPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0); wxRotationPoint p1 = rotated_point (0, 0, cos_angle, sin_angle, p0);
wxRotationPoint p2 = rotated_point (0, img.GetHeight(), cos_angle, sin_angle, p0); wxRotationPoint p2 = rotated_point (0, img.GetHeight(), cos_angle, sin_angle, p0);
@@ -2859,8 +2859,8 @@ wxImage wxImage::Rotate(double angle, const wxPoint & centre_of_rotation, bool i
} }
else else
{ {
const int & xs = wxCint (src.x); // wxCint performs rounding to the const int xs = wxCint (src.x); // wxCint performs rounding to the
const int & ys = wxCint (src.y); // closest integer const int ys = wxCint (src.y); // closest integer
if (0 <= xs && xs < img.GetWidth() && if (0 <= xs && xs < img.GetWidth() &&
0 <= ys && ys < img.GetHeight()) 0 <= ys && ys < img.GetHeight())

16
src/common/variant.cpp
View File

@@ -828,7 +828,8 @@ IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData)
* wxVariantDataTime * wxVariantDataTime
*/ */
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
class wxVariantDataTime: public wxVariantData class wxVariantDataTime: public wxVariantData
{ {
@@ -1135,7 +1136,8 @@ wxVariant::wxVariant(const wxList& val, const wxString& name) // List of variant
m_name = name; m_name = name;
} }
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time wxVariant::wxVariant(const wxTime& val, const wxString& name) // Time
{ {
m_data = new wxVariantDataTime(val); m_data = new wxVariantDataTime(val);
@@ -1439,7 +1441,8 @@ void wxVariant::operator= (const wxList& value)
} }
} }
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool wxVariant::operator== (const wxTime& value) const bool wxVariant::operator== (const wxTime& value) const
{ {
wxTime thisValue; wxTime thisValue;
@@ -1672,7 +1675,8 @@ wxString wxVariant::GetString() const
} }
} }
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
wxTime wxVariant::GetTime() const wxTime wxVariant::GetTime() const
{ {
wxTime value; wxTime value;
@@ -1872,7 +1876,8 @@ bool wxVariant::Convert(wxString* value) const
return TRUE; return TRUE;
} }
#if wxUSE_TIMEDATE // For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
bool wxVariant::Convert(wxTime* value) const bool wxVariant::Convert(wxTime* value) const
{ {
wxString type(GetType()); wxString type(GetType());
@@ -1898,3 +1903,4 @@ bool wxVariant::Convert(wxDate* value) const
} }
#endif #endif
// wxUSE_TIMEDATE // wxUSE_TIMEDATE

16
src/msw/makefile.wat
View File

@@ -1,6 +1,6 @@
#!/binb/wmake.exe #!/binb/wmake.exe
# This file was automatically generated by tmake at 14:31, 2000/01/19 # This file was automatically generated by tmake at 16:12, 2000/02/06
# 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!
# #
@@ -99,6 +99,7 @@ COMMONOBJS = &
dbtable.obj & dbtable.obj &
dcbase.obj & dcbase.obj &
dlgcmn.obj & dlgcmn.obj &
dndcmn.obj &
dobjcmn.obj & dobjcmn.obj &
docmdi.obj & docmdi.obj &
docview.obj & docview.obj &
@@ -119,6 +120,7 @@ COMMONOBJS = &
fs_zip.obj & fs_zip.obj &
ftp.obj & ftp.obj &
gdicmn.obj & gdicmn.obj &
geometry.obj &
gifdecod.obj & gifdecod.obj &
hash.obj & hash.obj &
helpbase.obj & helpbase.obj &
@@ -662,6 +664,9 @@ dcbase.obj: $(COMMDIR)\dcbase.cpp
dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp dlgcmn.obj: $(COMMDIR)\dlgcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dndcmn.obj: $(COMMDIR)\dndcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
dobjcmn.obj: $(COMMDIR)\dobjcmn.cpp dobjcmn.obj: $(COMMDIR)\dobjcmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -722,6 +727,9 @@ ftp.obj: $(COMMDIR)\ftp.cpp
gdicmn.obj: $(COMMDIR)\gdicmn.cpp gdicmn.obj: $(COMMDIR)\gdicmn.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
geometry.obj: $(COMMDIR)\geometry.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $<
gifdecod.obj: $(COMMDIR)\gifdecod.cpp gifdecod.obj: $(COMMDIR)\gifdecod.cpp
*$(CCC) $(CPPFLAGS) $(IFLAGS) $< *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
@@ -1134,7 +1142,7 @@ clean_zlib: .SYMBOLIC
cd $(WXDIR)\src\msw cd $(WXDIR)\src\msw
MFTYPE=wat MFTYPE=wat
makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
cd $(WXWIN)\distrib\msw\tmake cd $(WXDIR)\distrib\msw\tmake
tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE) tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
copy makefile.$(MFTYPE) $(WXWIN)\src\msw copy makefile.$(MFTYPE) $(WXDIR)\src\msw

8
src/msw/ole/automtn.cpp
View File

@@ -25,6 +25,9 @@
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>
// Watcom C++ gives a linker error if this is compiled in.
#ifndef __WATCOMC__
#include "wx/msw/ole/automtn.h" #include "wx/msw/ole/automtn.h"
#include "wx/msw/private.h" #include "wx/msw/private.h"
@@ -551,6 +554,8 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
oleVariant.vt = VT_BSTR; oleVariant.vt = VT_BSTR;
oleVariant.bstrVal = ConvertStringToOle(str); oleVariant.bstrVal = ConvertStringToOle(str);
} }
// For some reason, Watcom C++ can't link variant.cpp with time/date classes compiled
#if wxUSE_TIMEDATE && !defined(__WATCOMC__)
else if (type == wxT("date")) else if (type == wxT("date"))
{ {
wxDate date( variant.GetDate() ); wxDate date( variant.GetDate() );
@@ -569,6 +574,7 @@ bool ConvertVariantToOle(const wxVariant& variant, VARIANTARG& oleVariant)
time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date)) time.GetHour(), time.GetMinute(), time.GetSecond(), oleVariant.date))
return FALSE; return FALSE;
} }
#endif
else if (type == wxT("void*")) else if (type == wxT("void*"))
{ {
oleVariant.vt = VT_DISPATCH; oleVariant.vt = VT_DISPATCH;
@@ -1159,3 +1165,5 @@ void ShowException(LPOLESTR szMember, HRESULT hr, EXCEPINFO *pexcep, unsigned in
#endif #endif
#endif // __WATCOMC__

4
src/msw/radiobox.cpp
View File

@@ -85,7 +85,7 @@ LRESULT APIENTRY _EXPORT wxRadioBtnWndProc(HWND hWnd,
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// the pointer to standard radio button wnd proc // the pointer to standard radio button wnd proc
static WNDPROC s_wndprocRadioBtn = (WNDPROC)NULL; static WXFARPROC s_wndprocRadioBtn = (WXFARPROC)NULL;
#endif // __WIN32__ #endif // __WIN32__
@@ -688,7 +688,7 @@ void wxRadioBox::SubclassRadioButton(WXHWND hWndBtn)
HWND hwndBtn = (HWND)hWndBtn; HWND hwndBtn = (HWND)hWndBtn;
if ( !s_wndprocRadioBtn ) if ( !s_wndprocRadioBtn )
s_wndprocRadioBtn = (WNDPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC); s_wndprocRadioBtn = (WXFARPROC)::GetWindowLong(hwndBtn, GWL_WNDPROC);
::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc); ::SetWindowLong(hwndBtn, GWL_WNDPROC, (long)wxRadioBtnWndProc);
::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this); ::SetWindowLong(hwndBtn, GWL_USERDATA, (long)this);

5
src/msw/statbr95.cpp
View File

@@ -65,7 +65,8 @@ END_EVENT_TABLE()
// //
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static WNDPROC gs_wndprocStatBar = NULL; // static WNDPROC gs_wndprocStatBar = NULL;
static WXFARPROC gs_wndprocStatBar = (WXFARPROC) NULL;
LRESULT APIENTRY wxStatusBarProc(HWND hwnd, LRESULT APIENTRY wxStatusBarProc(HWND hwnd,
UINT message, UINT message,
@@ -130,7 +131,7 @@ bool wxStatusBar95::Create(wxWindow *parent,
// SubclassWin(m_hWnd); // SubclassWin(m_hWnd);
// but we want to process the messages from it still, so must subclass it // but we want to process the messages from it still, so must subclass it
gs_wndprocStatBar = (WNDPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC); gs_wndprocStatBar = (WXFARPROC)GetWindowLong(GetHwnd(), GWL_WNDPROC);
SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc); SetWindowLong(GetHwnd(), GWL_WNDPROC, (LONG)wxStatusBarProc);
SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this); SetWindowLong(GetHwnd(), GWL_USERDATA, (LONG)this);

5
src/xpm/xpmi.h
View File

@@ -44,6 +44,11 @@
#include "xpm.h" #include "xpm.h"
// Added by JACS for Watcom C++/wxWindows compilation (no popen/pclose functions)
#ifdef __WATCOMC__
#define NO_ZPIPE
#endif
/* /*
* lets try to solve include files * lets try to solve include files
*/ */

1
utils/projgen/makeproj.cpp
View File

@@ -286,6 +286,7 @@ void MyApp::GenerateSamples(const wxString& dir)
GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0)); GenerateSample("DrawingVC", "drawing", dir + wxString("/samples/drawing"), wxStringList("drawing.cpp", 0));
GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0)); GenerateSample("ScrollVC", "scroll", dir + wxString("/samples/scroll"), wxStringList("scroll.cpp", 0));
GenerateSample("WizardVC", "wizard", dir + wxString("/samples/wizard"), wxStringList("wiztest.cpp", 0)); GenerateSample("WizardVC", "wizard", dir + wxString("/samples/wizard"), wxStringList("wiztest.cpp", 0));
GenerateSample("RotateVC", "rotate", dir + wxString("/samples/rotate"), wxStringList("rotate.cpp", 0));
//// Demos //// Demos