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

Some .tex tweaks; pngdemo fix.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1379 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
1999-01-12 18:28:34 +00:00
parent f6fcbb63d0
commit 6be663cf0d
13 changed files with 104 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/latex/wx/array.tex
View File

@@ -263,10 +263,12 @@ wxArrayOfMyClass another(CompareMyClassObjects);
This macro declares a new object array class named {\it name} and containing This macro declares a new object array class named {\it name} and containing
the elements of type {\it T}. Example: the elements of type {\it T}. Example:
\begin{verbatim} \begin{verbatim}
class MyClass; class MyClass;
WX_DEFINE_OBJARRAY(MyClass, wxArrayOfMyClass); // note: not "MyClass *"! WX_DEFINE_OBJARRAY(MyClass, wxArrayOfMyClass); // note: not "MyClass *"!
\end{verbatim} \end{verbatim}
You must use \helpref{WX\_DEFINE\_OBJARRAY()}{wxdefineobjarray} macro to define You must use \helpref{WX\_DEFINE\_OBJARRAY()}{wxdefineobjarray} macro to define
the array class - otherwise you would get link errors. the array class - otherwise you would get link errors.
@@ -309,7 +311,7 @@ This macro may be used to delete all elements of the array before emptying it.
It can not be used with wxObjArrays - but they will delete their elements anyhow It can not be used with wxObjArrays - but they will delete their elements anyhow
when you call Empty(). when you call Empty().
\membersection{Default constructors}\label{wxarrayctor} \membersection{Default constructors}\label{wxarrayctordef}
\func{}{wxArray}{} \func{}{wxArray}{}
@@ -325,7 +327,7 @@ two arguments of type {\it T} where {\it T} is the array element type and which
should return a negative, zero or positive value according to whether the first should return a negative, zero or positive value according to whether the first
element passed to it is less than, equal to or greater than the second one. element passed to it is less than, equal to or greater than the second one.
\membersection{wxArray copy constructor and assignemnt operator}\label{wxarrayctorcopy} \membersection{wxArray copy constructor and assignment operator}\label{wxarrayctorcopy}
\func{}{wxArray}{\param{const wxArray\& }{array}} \func{}{wxArray}{\param{const wxArray\& }{array}}

9
docs/latex/wx/classes.tex
View File

@@ -182,8 +182,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input text.tex \input text.tex
\input textdlg.tex \input textdlg.tex
\input valtext.tex \input valtext.tex
\input tempfile.tex % \input tempfile.tex
\input textfile.tex % \input textfile.tex
\input thread.tex \input thread.tex
\input time.tex \input time.tex
\input timer.tex \input timer.tex
@@ -202,8 +202,3 @@ $$\image{14cm;0cm}{wxclass.ps}$$
\input function.tex \input function.tex
\input keycode.tex \input keycode.tex
%%% Local Variables:
%%% mode: latex
%%% TeX-master: "referenc"
%%% End:

22
docs/latex/wx/file.tex
View File

@@ -12,6 +12,7 @@ None.
\wxheading{Constants} \wxheading{Constants}
wx/file.h defines the following constants: wx/file.h defines the following constants:
{\small {\small
\begin{verbatim} \begin{verbatim}
#define wxS_IRUSR 00400 #define wxS_IRUSR 00400
@@ -35,12 +36,11 @@ These constants define the file access rights and are used with
\helpref{wxFile::Create}{wxfilecreate} and \helpref{wxFile::Open}{wxfileopen}. \helpref{wxFile::Create}{wxfilecreate} and \helpref{wxFile::Open}{wxfileopen}.
The {\it OpenMode} enumeration defines the different modes for opening a file, The {\it OpenMode} enumeration defines the different modes for opening a file,
it's defined inside wxFile class so its members should be specified with {\it it's defined inside wxFile class so its members should be specified with {\it wxFile::} scope
wxFile::} scope resolution prefix. It is also used with resolution prefix. It is also used with \helpref{wxFile::Access}{wxfileaccess} function.
\helpref{wxFile::Access}{wxfileaccess} function.
\twocolwidtha{7cm}% \twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt \begin{twocollist}\itemsep=0pt%
\twocolitem{{\bf wxFile::read}}{Open file for reading or test if it can be opened for reading with Access()} \twocolitem{{\bf wxFile::read}}{Open file for reading or test if it can be opened for reading with Access()}
\twocolitem{{\bf wxFile::write}}{Open file for writing deleting the contents of the file if it already exists \twocolitem{{\bf wxFile::write}}{Open file for writing deleting the contents of the file if it already exists
or test if it can be opened for writing with Access()} or test if it can be opened for writing with Access()}
@@ -55,7 +55,7 @@ invalid value of type {\it off\_t} and is returned by functions returning {\it o
mode constants used with \helpref{Seek()}{wxfileseek}: mode constants used with \helpref{Seek()}{wxfileseek}:
\twocolwidtha{7cm} \twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt \begin{twocollist}\itemsep=0pt%
\twocolitem{{\bf wxFromStart}}{Count offset from the start of the file} \twocolitem{{\bf wxFromStart}}{Count offset from the start of the file}
\twocolitem{{\bf wxFromCurrent}}{Count offset from the current position of the file pointer} \twocolitem{{\bf wxFromCurrent}}{Count offset from the current position of the file pointer}
\twocolitem{{\bf wxFromEnd}}{Count offset from the end of the file (backwards)} \twocolitem{{\bf wxFromEnd}}{Count offset from the end of the file (backwards)}
@@ -97,12 +97,14 @@ Destructor will close the file.
NB: it is not virtual so you should {\it not} derive from wxFile! NB: it is not virtual so you should {\it not} derive from wxFile!
\membersection{wxFile::Access}\label{wxfileaccess} \membersection{wxFile::Access}\label{wxfileaccess}
\func{static bool}{Access}{\param{const char *}{ name}, \param{OpenMode}{ mode}
\func{static bool}{Access}{\param{const char *}{ name}, \param{OpenMode}{ mode}}
This function verifies if we may access the given file in specified mode. Only This function verifies if we may access the given file in specified mode. Only
values of wxFile::read or wxFile::write really make sense here. values of wxFile::read or wxFile::write really make sense here.
\membersection{wxFile::Attach}\label{wxfileattach} \membersection{wxFile::Attach}\label{wxfileattach}
\func{void}{Attach}{\param{int}{ fd}} \func{void}{Attach}{\param{int}{ fd}}
Attaches an existing file descriptor to the wxFile object. Example of predefined Attaches an existing file descriptor to the wxFile object. Example of predefined
@@ -126,12 +128,14 @@ Creates a file for writing. If the file already exists, setting {\bf overwrite}
will ensure it is overwritten. will ensure it is overwritten.
\membersection{wxFile::Detach}\label{wxfiledetach} \membersection{wxFile::Detach}\label{wxfiledetach}
\func{void}{Detach}{\void} \func{void}{Detach}{\void}
Get back a file descriptor from wxFile object - the caller is responsible for closing the file if this Get back a file descriptor from wxFile object - the caller is responsible for closing the file if this
descriptor is opened. \helpref{IsOpened()}{wxfileisopened} will return FALSE after call to Detach(). descriptor is opened. \helpref{IsOpened()}{wxfileisopened} will return FALSE after call to Detach().
\membersection{wxFile::fd}\label{wxfilefd} \membersection{wxFile::fd}\label{wxfilefd}
\constfunc{int}{fd}{\void} \constfunc{int}{fd}{\void}
Returns the file descriptor associated with the file. Returns the file descriptor associated with the file.
@@ -252,6 +256,8 @@ Writes the specified number of bytes from a buffer.
TRUE if the operation was successful. TRUE if the operation was successful.
\membersection{wxFile::Write}\label{wxfilewrites} \membersection{wxFile::Write}\label{wxfilewrites}
\func{bool}{Write}{\param{const wxString& }{s}} \func{bool}{Write}{\param{const wxString& }{s}}
Writes the contents of the string to the file, returns TRUE on success Writes the contents of the string to the file, returns TRUE on success.

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

@@ -43,7 +43,7 @@ No base class.
\latexignore{\rtfignore{\wxheading{Members}}} \latexignore{\rtfignore{\wxheading{Members}}}
\membersection{MessageParameters class}{wxfiletypemessageparameters} \membersection{MessageParameters class}\label{wxfiletypemessageparameters}
One of the most common usages of MIME is to encode an e-mail message. The MIME One of the most common usages of MIME is to encode an e-mail message. The MIME
type of the encoded message is an example of a {\it message parameter}. These type of the encoded message is an example of a {\it message parameter}. These

17
docs/latex/wx/ftp.tex
View File

@@ -16,7 +16,7 @@
\membersection{wxFTP::SendCommand} \membersection{wxFTP::SendCommand}
\func{bool}{SendCommand}{\param{const wxString\&}{command}, \param{char }{ret}} \func{bool}{SendCommand}{\param{const wxString\&}{ command}, \param{char }{ret}}
Send the specified \it{command} to the FTP server. \it{ret} specifies Send the specified \it{command} to the FTP server. \it{ret} specifies
the expected result. the expected result.
@@ -37,21 +37,21 @@ Returns the last command result.
\membersection{wxFTP::ChDir} \membersection{wxFTP::ChDir}
\func{bool}{ChDir}{\param{const wxString\&}{dir}} \func{bool}{ChDir}{\param{const wxString\&}{ dir}}
Change the current FTP working directory. Change the current FTP working directory.
Returns TRUE, if successful. Returns TRUE, if successful.
\membersection{wxFTP::MkDir} \membersection{wxFTP::MkDir}
\func{bool}{MkDir}{\param{const wxString\&}{dir}} \func{bool}{MkDir}{\param{const wxString\&}{ dir}}
Create the specified directory in the current FTP working directory. Create the specified directory in the current FTP working directory.
Returns TRUE, if successful. Returns TRUE, if successful.
\membersection{wxFTP::RmDir} \membersection{wxFTP::RmDir}
\func{bool}{RmDir}{\param{const wxString\&}{dir}} \func{bool}{RmDir}{\param{const wxString\&}{ dir}}
Remove the specified directory from the current FTP working directory. Remove the specified directory from the current FTP working directory.
Returns TRUE, if successful. Returns TRUE, if successful.
@@ -66,7 +66,7 @@ Returns the current FTP working directory.
\membersection{wxFTP::Rename} \membersection{wxFTP::Rename}
\func{bool}{Rename}{\param{const wxString\&}{src}, \param{const wxString\&}{dst}} \func{bool}{Rename}{\param{const wxString\&}{ src}, \param{const wxString\&}{ dst}}
Rename the specified \it{src} element into \it{dst} Rename the specified \it{src} element into \it{dst}
Returns TRUE, if successful. Returns TRUE, if successful.
@@ -75,7 +75,7 @@ Returns TRUE, if successful.
\membersection{wxFTP::RmFile} \membersection{wxFTP::RmFile}
\func{bool}{RmFile}{\param{const wxString\&}{path}} \func{bool}{RmFile}{\param{const wxString\&}{ path}}
Delete the file specified by \it{path}. Delete the file specified by \it{path}.
Returns TRUE, if successful. Returns TRUE, if successful.
@@ -84,12 +84,13 @@ Returns TRUE, if successful.
\membersection{wxFTP::GetOutputStream} \membersection{wxFTP::GetOutputStream}
\func{wxOutputStream *}{GetOutputStream}{\param{const wxString\&}{file}} \func{wxOutputStream *}{GetOutputStream}{\param{const wxString\&}{ file}}
Initializes an output stream to the specified \it{file}. The returned Initializes an output stream to the specified \it{file}. The returned
stream has all but seek functionality of wxStreams. When the user finishes stream has all but the seek functionality of wxStreams. When the user finishes
writing data, he has to delete the stream to close it. writing data, he has to delete the stream to close it.
\wxheading{Return value} \wxheading{Return value}
An initialized write-only stream. An initialized write-only stream.

7
docs/latex/wx/image.tex
View File

@@ -62,7 +62,7 @@ Loads an image from an input stream.
\docparam{type}{May be one of the following: \docparam{type}{May be one of the following:
\twocolwidtha{5cm} \twocolwidtha{5cm}%
\begin{twocollist} \begin{twocollist}
\twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_BMP}}}{Load a Windows bitmap file.} \twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_BMP}}}{Load a Windows bitmap file.}
\twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_PNG}}}{Load a PNG bitmap file.} \twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_PNG}}}{Load a PNG bitmap file.}
@@ -288,7 +288,7 @@ The meaning of {\it stream} data is determined by the {\it type} parameter.}
\docparam{type}{One of the following values: \docparam{type}{One of the following values:
\twocolwidtha{5cm} \twocolwidtha{5cm}%
\begin{twocollist} \begin{twocollist}
\twocolitem{{\bf wxBITMAP\_TYPE\_BMP}}{Load a Windows image file.} \twocolitem{{\bf wxBITMAP\_TYPE\_BMP}}{Load a Windows image file.}
\twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Load a PNG image file.} \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Load a PNG image file.}
@@ -345,7 +345,7 @@ Saves a image in the given stream.
\docparam{type}{Currently only one type can be used: \docparam{type}{Currently only one type can be used:
\twocolwidtha{5cm} \twocolwidtha{5cm}%
\begin{twocollist} \begin{twocollist}
\twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Save a PNG image file.} \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Save a PNG image file.}
\end{twocollist} \end{twocollist}
@@ -575,4 +575,3 @@ Sets the handler type.
\docparam{name}{Handler type.} \docparam{name}{Handler type.}

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

@@ -175,7 +175,7 @@ The key string is copied and stored by the list implementation.
Clears the list (but does not delete the client data stored with each node). Clears the list (but does not delete the client data stored with each node).
\membersection{wxList::DeleteContents} \membersection{wxList::DeleteContents}\label{wxlistdeletecontents}
\func{void}{DeleteContents}{\param{bool}{ destroy}} \func{void}{DeleteContents}{\param{bool}{ destroy}}

10
docs/latex/wx/protocol.tex
View File

@@ -42,9 +42,10 @@ Returns the initialized stream. You will have to delete it yourself.
\membersection{wxProtocol::Abort}\label{wxprotoabort} \membersection{wxProtocol::Abort}\label{wxprotoabort}
\func{bool }{Abort}{\void} \func{bool}{Abort}{\void}
Abort the current stream. Abort the current stream.
\it{WARNING: It is advised to destroy the input stream instead of aborting the stream this way.} \it{WARNING: It is advised to destroy the input stream instead of aborting the stream this way.}
\wxheading{Return value} \wxheading{Return value}
@@ -55,7 +56,7 @@ Returns TRUE, if successful, else FALSE.
\membersection{wxProtocol::GetError} \membersection{wxProtocol::GetError}
\func{wxProtocolError }{GetError}{\void} \func{wxProtocolError}{GetError}{\void}
Returns the last occured error. Returns the last occured error.
@@ -63,7 +64,7 @@ Returns the last occured error.
\membersection{wxProtocol::GetContentType} \membersection{wxProtocol::GetContentType}
\func{wxString }{GetContentType}{\void} \func{wxString}{GetContentType}{\void}
Returns the type of the content of the last opened stream. It is a mime-type. Returns the type of the content of the last opened stream. It is a mime-type.
@@ -77,6 +78,7 @@ Sets the authentication user. It is mainly useful when FTP is used.
\membersection{wxProtocol::SetPassword} \membersection{wxProtocol::SetPassword}
\func{void }{SetPassword}{\param{const wxString\&}{ user}} \func{void}{SetPassword}{\param{const wxString\&}{ user}}
Sets the authentication password. It is mainly useful when FTP is used. Sets the authentication password. It is mainly useful when FTP is used.

4
docs/latex/wx/tcontain.tex
View File

@@ -34,8 +34,8 @@ own the object pointers to which they store.
For the same portability reasons, container classes implementation in wxWindows For the same portability reasons, container classes implementation in wxWindows
does not use templates, but is rather based on C preprocessor i.e. is done with does not use templates, but is rather based on C preprocessor i.e. is done with
the macros: {\it WX\_DECLARE\_LIST} and {\it WX\_DEFINE\_LIST} for the linked the macros: {\it WX\_DECLARE\_LIST} and {\it WX\_DEFINE\_LIST} for the linked
lists and {\it WX\_DECLARE\_ARRAY}, {\it WX\_DECLARE\_OBJARRAY} and {\it lists and {\it WX\_DECLARE\_ARRAY}, {\it WX\_DECLARE\_OBJARRAY} and {\it WX\_DEFINE\_OBJARRAY} for
WX\_DEFINE\_OBJARRAY} for the dynamic arrays. The "DECLARE" macro declares a the dynamic arrays. The "DECLARE" macro declares a
new container class containing the elements of given type and is needed for all new container class containing the elements of given type and is needed for all
three types of container classes: lists, arrays and objarrays. The "DEFINE" three types of container classes: lists, arrays and objarrays. The "DEFINE"
classes must be inserted in your program in a place where the {\bf full classes must be inserted in your program in a place where the {\bf full

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

@@ -38,5 +38,5 @@ This chapter contains a selection of topic overviews.
\input tstring.tex \input tstring.tex
\input tdnd.tex \input tdnd.tex
\input tthreads.tex \input tthreads.tex
\input tfile.tex % \input tfile.tex
\input tusage.tex \input tusage.tex

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

@@ -59,7 +59,7 @@ Returns the last error. This error refers to the URL parsing or to the protocol.
It can be one of these errors: It can be one of these errors:
\twocolwidtha{7cm} \twocolwidtha{7cm}
\begin{twocollist}\itemsep=0pt \begin{twocollist}\itemsep=0pt%
\twocolitem{{\bf wxURL\_NOERR}}{No error.} \twocolitem{{\bf wxURL\_NOERR}}{No error.}
\twocolitem{{\bf wxURL\_SNTXERR}}{Syntax error in the URL string.} \twocolitem{{\bf wxURL\_SNTXERR}}{Syntax error in the URL string.}
\twocolitem{{\bf wxURL\_NOPROTO}}{Found no protocol which can get this URL.} \twocolitem{{\bf wxURL\_NOPROTO}}{Found no protocol which can get this URL.}

112
samples/makefile.g95
View File

@@ -11,66 +11,68 @@
# info # info
# Set WXDIR for your system # Set WXDIR for your system
SHELL=cmd.exe
WXDIR = .. WXDIR = ..
THISDIR=$(WXDIR)/samples THISDIR=$(WXDIR)/samples
all: all:
cd $(WXDIR)/samples/bombs; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95
cd $(WXDIR)/samples/fractal; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95
cd $(WXDIR)/samples/splitter; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95
cd $(WXDIR)/samples/resource; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95
cd $(WXDIR)/samples/controls; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95
cd $(WXDIR)/samples/listctrl; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95
cd $(WXDIR)/samples/treectrl; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95
cd $(WXDIR)/samples/validate; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95
cd $(WXDIR)/samples/mdi; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95
cd $(WXDIR)/samples/minimal; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95
cd $(WXDIR)/samples/layout; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95
cd $(WXDIR)/samples/printing; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95
cd $(WXDIR)/samples/proplist; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95
cd $(WXDIR)/samples/toolbar; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95
cd $(WXDIR)/samples/dialogs; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95
cd $(WXDIR)/samples/docview; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95
cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95
cd $(WXDIR)/samples/sashtest; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95
cd $(WXDIR)/samples/controls; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95
cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95
cd $(WXDIR)/samples/grid; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95
cd $(WXDIR)/samples/internat; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95
cd $(WXDIR)/samples/checklst; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95
cd $(WXDIR)/samples/dnd; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95
cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95
cd $(WXDIR)/samples/joytest; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95
cd $(WXDIR)/samples/memcheck; make -f makefile.g95 $(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95
# cd $(WXDIR)/samples/regtest; make -f makefile.g95 # $(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95
clean: clean:
cd $(WXDIR)/samples/bombs; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95 clean
cd $(WXDIR)/samples/fractal; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95 clean
cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95 clean
cd $(WXDIR)/samples/mdi; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/mdi -f makefile.g95 clean
cd $(WXDIR)/samples/minimal; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/minimal -f makefile.g95 clean
cd $(WXDIR)/samples/layout; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/layout -f makefile.g95 clean
cd $(WXDIR)/samples/printing; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/printing -f makefile.g95 clean
cd $(WXDIR)/samples/proplist; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/proplist -f makefile.g95 clean
cd $(WXDIR)/samples/toolbar; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/toolbar -f makefile.g95 clean
cd $(WXDIR)/samples/dialogs; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/dialogs -f makefile.g95 clean
cd $(WXDIR)/samples/resource; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/resource -f makefile.g95 clean
cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/listctrl -f makefile.g95 clean
cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/treectrl -f makefile.g95 clean
cd $(WXDIR)/samples/validate; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/validate -f makefile.g95 clean
cd $(WXDIR)/samples/docview; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/docview -f makefile.g95 clean
cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/docvwmdi -f makefile.g95 clean
cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/sashtest -f makefile.g95 clean
cd $(WXDIR)/samples/controls; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/controls -f makefile.g95 clean
cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/nativdlg -f makefile.g95 clean
cd $(WXDIR)/samples/grid; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/grid -f makefile.g95 clean
cd $(WXDIR)/samples/internat; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/internat -f makefile.g95 clean
cd $(WXDIR)/samples/checklst; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/checklst -f makefile.g95 clean
cd $(WXDIR)/samples/dnd; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/dnd -f makefile.g95 clean
cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/ownerdrw -f makefile.g95 clean
cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/regtest -f makefile.g95 clean
cd $(WXDIR)/samples/joytest; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/joytest -f makefile.g95 clean
cd $(WXDIR)/samples/memcheck; make -f makefile.g95 clean $(MAKE) -C $(WXDIR)/samples/memcheck -f makefile.g95 clean

6
samples/png/pngdemo.cpp
View File

@@ -178,10 +178,10 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
if ( g_TestBitmap && g_TestBitmap->Ok() ) if ( g_TestBitmap && g_TestBitmap->Ok() )
{ {
wxMemoryDC memDC; wxMemoryDC memDC;
if ( g_TestBitmap->GetColourMap() ) if ( g_TestBitmap->GetPalette() )
{ {
memDC.SetPalette(* g_TestBitmap->GetColourMap()); memDC.SetPalette(* g_TestBitmap->GetPalette());
dc.SetPalette(* g_TestBitmap->GetColourMap()); dc.SetPalette(* g_TestBitmap->GetPalette());
} }
memDC.SelectObject(* g_TestBitmap); memDC.SelectObject(* g_TestBitmap);