Some .tex tweaks; pngdemo fix.

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

diff --git a/docs/latex/wx/array.tex b/docs/latex/wx/array.tex
index f4d712e9abcbe7e7c187bfd2cca10b2aa0271f76..22c204212ac8e64d14048d912cc7a24a6077745c 100644 (file)
--- a/docs/latex/wx/array.tex
+++ b/docs/latex/wx/array.tex
@@ -263,10 +263,12 @@ wxArrayOfMyClass another(CompareMyClassObjects);
 
 This macro declares a new object array class named {\it name} and containing
 the elements of type {\it T}. Example:
 
 This macro declares a new object array class named {\it name} and containing
 the elements of type {\it T}. Example:

+

 \begin{verbatim}
 class MyClass;
 WX_DEFINE_OBJARRAY(MyClass, wxArrayOfMyClass); // note: not "MyClass *"!
 \end{verbatim}
 \begin{verbatim}
 class MyClass;
 WX_DEFINE_OBJARRAY(MyClass, wxArrayOfMyClass); // note: not "MyClass *"!
 \end{verbatim}

+

 You must use \helpref{WX\_DEFINE\_OBJARRAY()}{wxdefineobjarray} macro to define
 the array class - otherwise you would get link errors.
 
 You must use \helpref{WX\_DEFINE\_OBJARRAY()}{wxdefineobjarray} macro to define
 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
 when you call Empty().
 
 It can not be used with wxObjArrays - but they will delete their elements anyhow
 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
 element passed to it is less than, equal to or greater than the second one.
 
 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.
 

-\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}}
 

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 91435ff86469103e1b6b0405724243966c64c246..80f702b95e93885ac85c4e3df8d0ee48ad03e5d6 100644 (file)
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -182,8 +182,8 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input text.tex
 \input textdlg.tex
 \input valtext.tex
 \input text.tex
 \input textdlg.tex
 \input valtext.tex

-\input tempfile.tex
-\input textfile.tex
+% \input tempfile.tex
+% \input textfile.tex

 \input thread.tex
 \input time.tex
 \input timer.tex
 \input thread.tex
 \input time.tex
 \input timer.tex


@@ -202,8 +202,3 @@ $$\image{14cm;0cm}{wxclass.ps}$$
 \input function.tex
 \input keycode.tex
 
 \input function.tex
 \input keycode.tex
 

-
-%%% Local Variables: 
-%%% mode: latex
-%%% TeX-master: "referenc"
-%%% End: 

diff --git a/docs/latex/wx/file.tex b/docs/latex/wx/file.tex
index da864d38dbe373c9542a82722cb8a5b3c9656954..62aedec322fbc8d8e05d2adde0a464ecd8929f96 100644 (file)
--- a/docs/latex/wx/file.tex
+++ b/docs/latex/wx/file.tex
@@ -12,6 +12,7 @@ None.
 \wxheading{Constants}
 
 wx/file.h defines the following constants:
 \wxheading{Constants}
 
 wx/file.h defines the following constants:

+

 {\small
 \begin{verbatim}
 #define wxS_IRUSR 00400
 {\small
 \begin{verbatim}
 #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}.
 
 The {\it OpenMode} enumeration defines the different modes for opening a file,
 \helpref{wxFile::Create}{wxfilecreate} and \helpref{wxFile::Open}{wxfileopen}.
 
 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
-wxFile::} scope resolution prefix. It is also used with 
-\helpref{wxFile::Access}{wxfileaccess} function.
+it's defined inside wxFile class so its members should be specified with {\it wxFile::} scope
+resolution prefix. It is also used with \helpref{wxFile::Access}{wxfileaccess} function.

 
 

-\twocolwidtha{7cm}%
-\begin{twocollist}\itemsep=0pt
+\twocolwidtha{7cm}
+\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::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()}
 \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
 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}:
 
 \twocolwidtha{7cm}
 mode constants used with \helpref{Seek()}{wxfileseek}:
 
 \twocolwidtha{7cm}

-\begin{twocollist}\itemsep=0pt
+\begin{twocollist}\itemsep=0pt%

 \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 wxFromEnd}}{Count offset from the end of the file (backwards)}
 \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 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!
 
 \membersection{wxFile::Access}\label{wxfileaccess}
 NB: it is not virtual so you should {\it not} derive from wxFile!
 
 \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
 values of wxFile::read or wxFile::write really make sense here.
 
 \membersection{wxFile::Attach}\label{wxfileattach}
 
 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.
 
 \membersection{wxFile::Attach}\label{wxfileattach}

+

 \func{void}{Attach}{\param{int}{ fd}}
 
 Attaches an existing file descriptor to the wxFile object. Example of predefined
 \func{void}{Attach}{\param{int}{ fd}}
 
 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.
 
 \membersection{wxFile::Detach}\label{wxfiledetach}
 will ensure it is overwritten.
 
 \membersection{wxFile::Detach}\label{wxfiledetach}

+

 \func{void}{Detach}{\void}
 
 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().
 
 \membersection{wxFile::fd}\label{wxfilefd}
 \func{void}{Detach}{\void}
 
 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().
 
 \membersection{wxFile::fd}\label{wxfilefd}

+

 \constfunc{int}{fd}{\void}
 
 Returns the file descriptor associated with the file.
 \constfunc{int}{fd}{\void}
 
 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.
 
 \membersection{wxFile::Write}\label{wxfilewrites}
 TRUE if the operation was successful.
 
 \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.
+

diff --git a/docs/latex/wx/filetype.tex b/docs/latex/wx/filetype.tex
index f4d52516a7e8718f12e4184554bd77a2bdd75a7c..2ae03f063a262c6c2cdf11121003dd3defa82e23 100644 (file)
--- a/docs/latex/wx/filetype.tex
+++ b/docs/latex/wx/filetype.tex
@@ -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
 type of the encoded message is an example of a {\it message parameter}. These
 
 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

diff --git a/docs/latex/wx/ftp.tex b/docs/latex/wx/ftp.tex
index 11fce8e93134d77f464d193426100538d8d44725..4a603d96799fe6f22fbca0ef0357547d1af1f8e8 100644 (file)
--- a/docs/latex/wx/ftp.tex
+++ b/docs/latex/wx/ftp.tex
@@ -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
 the expected result.
 
 Send the specified \it{command} to the FTP server. \it{ret} specifies
 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.
 Returns TRUE, if successful.
 
 \membersection{wxFTP::MkDir}
 
 
 Change the current FTP working directory.
 Returns TRUE, if successful.
 
 \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.
 Returns TRUE, if successful.
 
 \membersection{wxFTP::RmDir}
 
 
 Create the specified directory in the current FTP working directory.
 Returns TRUE, if successful.
 
 \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.
 Returns TRUE, if successful.
 
 Remove the specified directory from the current FTP working directory.
 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}
 Returns TRUE, if successful.
 
 Rename the specified \it{src} element into \it{dst}
 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}.
 Returns TRUE, if successful.
 
 Delete the file specified by \it{path}.
 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.
 
 \wxheading{Return value}
 
 An initialized write-only stream.
 writing data, he has to delete the stream to close it.
 
 \wxheading{Return value}
 
 An initialized write-only stream.

+

diff --git a/docs/latex/wx/image.tex b/docs/latex/wx/image.tex
index bbe5f315abba59603630040cdd25767161682fe4..2037c9e7dbf21841d74b55a2dbe2eb034e12db2c 100644 (file)
--- a/docs/latex/wx/image.tex
+++ b/docs/latex/wx/image.tex
@@ -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}
 \twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_BMP}}}{Load a Windows bitmap file.}
 \twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_PNG}}}{Load a PNG bitmap file.}
 \begin{twocollist}
 \twocolitem{{\bf \indexit{wxBITMAP\_TYPE\_BMP}}}{Load a Windows 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}
 \twocolitem{{\bf wxBITMAP\_TYPE\_BMP}}{Load a Windows image file.}
 \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Load a PNG image file.}
 \begin{twocollist}
 \twocolitem{{\bf wxBITMAP\_TYPE\_BMP}}{Load a Windows 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}
 \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Save a PNG image file.}
 \end{twocollist}
 \begin{twocollist}
 \twocolitem{{\bf wxBITMAP\_TYPE\_PNG}}{Save a PNG image file.}
 \end{twocollist}


@@ -575,4 +575,3 @@ Sets the handler type.
 
 \docparam{name}{Handler type.}
 
 
 \docparam{name}{Handler type.}
 

-

diff --git a/docs/latex/wx/list.tex b/docs/latex/wx/list.tex
index 80abf3d7b70b99d86b0012b02af1672acf36dd36..90d45d61871854697fcce2f459806b3241c74bed 100644 (file)
--- a/docs/latex/wx/list.tex
+++ b/docs/latex/wx/list.tex
@@ -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}}
 

diff --git a/docs/latex/wx/protocol.tex b/docs/latex/wx/protocol.tex
index 7cf0aed0c142cea4cedb9ad06b913922bc6260cb..4bf5ed135311fb45c7ed08bfe45a13e1db0bf24b 100644 (file)
--- a/docs/latex/wx/protocol.tex
+++ b/docs/latex/wx/protocol.tex
@@ -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.}
 
 \wxheading{Return value}
 \it{WARNING: It is advised to destroy the input stream instead of aborting the stream this way.}
 
 \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.

+

diff --git a/docs/latex/wx/tcontain.tex b/docs/latex/wx/tcontain.tex
index 8f8cc6d47d5982d5e71b3565a5eb3e6bf1b1d710..0e5749f165b40aa5be891166f1752456eb4f1adb 100644 (file)
--- a/docs/latex/wx/tcontain.tex
+++ b/docs/latex/wx/tcontain.tex
@@ -34,8 +34,8 @@ own the object pointers to which they store.
 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
 the macros: {\it WX\_DECLARE\_LIST} and {\it WX\_DEFINE\_LIST} for the linked
 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
 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
-WX\_DEFINE\_OBJARRAY} for the dynamic arrays. The "DECLARE" macro declares a
+lists and {\it WX\_DECLARE\_ARRAY}, {\it WX\_DECLARE\_OBJARRAY} and {\it WX\_DEFINE\_OBJARRAY} for
+the dynamic arrays. The "DECLARE" macro declares a

 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"
 classes must be inserted in your program in a place where the {\bf full
 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"
 classes must be inserted in your program in a place where the {\bf full

diff --git a/docs/latex/wx/topics.tex b/docs/latex/wx/topics.tex
index cda8c6764de7b68efbcc2fcaf100f62ee8ea43ea..6c0ab70abe8c0f4f841cb7a4077fcc62d96b43dc 100644 (file)
--- a/docs/latex/wx/topics.tex
+++ b/docs/latex/wx/topics.tex
@@ -38,5 +38,5 @@ This chapter contains a selection of topic overviews.
 \input tstring.tex
 \input tdnd.tex
 \input tthreads.tex
 \input tstring.tex
 \input tdnd.tex
 \input tthreads.tex

-\input tfile.tex
+% \input tfile.tex

 \input tusage.tex
 \input tusage.tex

diff --git a/docs/latex/wx/url.tex b/docs/latex/wx/url.tex
index bc3fe3f15bd9e7353e06973426b90e56e45713cd..66c49c7aad4efdea29a2fa7a90725ace6583bcbb 100644 (file)
--- a/docs/latex/wx/url.tex
+++ b/docs/latex/wx/url.tex
@@ -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:
 
 \twocolwidtha{7cm}
 It can be one of these errors:
 
 \twocolwidtha{7cm}

-\begin{twocollist}\itemsep=0pt
+\begin{twocollist}\itemsep=0pt%

 \twocolitem{{\bf wxURL\_NOERR}}{No error.}
 \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\_NOERR}}{No error.}
 \twocolitem{{\bf wxURL\_SNTXERR}}{Syntax error in the URL string.}
 \twocolitem{{\bf wxURL\_NOPROTO}}{Found no protocol which can get this URL.}

diff --git a/samples/makefile.g95 b/samples/makefile.g95
index 5a4e995f242ad6ba7fa91ebc841dbd9957717f04..8b5be576cb93946479b36f2009ab16281545ea94 100644 (file)
--- a/samples/makefile.g95
+++ b/samples/makefile.g95
@@ -11,66 +11,68 @@
 # info
 
 # Set WXDIR for your system
 # info
 
 # Set WXDIR for your system

+SHELL=cmd.exe

 WXDIR = ..
 
 THISDIR=$(WXDIR)/samples
 
 all:
 WXDIR = ..
 
 THISDIR=$(WXDIR)/samples
 
 all:

-               cd $(WXDIR)/samples/bombs; make -f makefile.g95
-               cd $(WXDIR)/samples/fractal; make -f makefile.g95
-               cd $(WXDIR)/samples/splitter; make -f makefile.g95
-               cd $(WXDIR)/samples/resource; make -f makefile.g95
-               cd $(WXDIR)/samples/controls; make -f makefile.g95
-               cd $(WXDIR)/samples/listctrl; make -f makefile.g95
-               cd $(WXDIR)/samples/treectrl; make -f makefile.g95
-               cd $(WXDIR)/samples/validate; make -f makefile.g95
-               cd $(WXDIR)/samples/mdi; make -f makefile.g95
-               cd $(WXDIR)/samples/minimal; make -f makefile.g95
-               cd $(WXDIR)/samples/layout; make -f makefile.g95
-               cd $(WXDIR)/samples/printing; make -f makefile.g95
-               cd $(WXDIR)/samples/proplist; make -f makefile.g95
-               cd $(WXDIR)/samples/toolbar; make -f makefile.g95
-               cd $(WXDIR)/samples/dialogs; make -f makefile.g95
-               cd $(WXDIR)/samples/docview; make -f makefile.g95
-               cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95
-               cd $(WXDIR)/samples/sashtest; make -f makefile.g95
-               cd $(WXDIR)/samples/controls; make -f makefile.g95
-               cd $(WXDIR)/samples/nativdlg; make -f makefile.g95
-               cd $(WXDIR)/samples/grid; make -f makefile.g95
-               cd $(WXDIR)/samples/internat; make -f makefile.g95
-               cd $(WXDIR)/samples/checklst; make -f makefile.g95
-               cd $(WXDIR)/samples/dnd; make -f makefile.g95
-               cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95
-               cd $(WXDIR)/samples/joytest; make -f makefile.g95
-               cd $(WXDIR)/samples/memcheck; make -f makefile.g95
-#              cd $(WXDIR)/samples/regtest; make -f makefile.g95
+               $(MAKE) -C $(WXDIR)/samples/bombs -f makefile.g95
+               $(MAKE) -C $(WXDIR)/samples/fractal -f makefile.g95
+               $(MAKE) -C $(WXDIR)/samples/splitter -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/resource -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/controls -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/listctrl -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/treectrl -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/validate -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/mdi -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/minimal -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/layout -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/printing -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/proplist -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/toolbar -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/dialogs -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/docview -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/docvwmdi -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/sashtest -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/controls -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/nativdlg -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/grid -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/internat -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/checklst -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/dnd -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/ownerdrw -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/joytest -f makefile.g95
+               $(MAKE) -C  $(WXDIR)/samples/memcheck -f makefile.g95
+#              $(MAKE) -C  $(WXDIR)/samples/regtest -f makefile.g95

 
 clean:
 
 clean:

-               cd $(WXDIR)/samples/bombs; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/fractal; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/splitter; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/mdi; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/minimal; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/layout; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/printing; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/proplist; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/toolbar; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/dialogs; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/resource; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/listctrl; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/treectrl; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/validate; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/docview; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/docvwmdi; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/sashtest; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/controls; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/nativdlg; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/grid; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/internat; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/checklst; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/dnd; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/ownerdrw; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/regtest; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/joytest; make -f makefile.g95 clean
-               cd $(WXDIR)/samples/memcheck; make -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/bombs -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/fractal -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/splitter -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/mdi -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/minimal -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/layout -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/printing -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/proplist -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/toolbar -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/dialogs -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/resource -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/listctrl -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/treectrl -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/validate -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/docview -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/docvwmdi -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/sashtest -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/controls -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/nativdlg -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/grid -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/internat -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/checklst -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/dnd -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/ownerdrw -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/regtest -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/joytest -f makefile.g95 clean
+               $(MAKE) -C  $(WXDIR)/samples/memcheck -f makefile.g95 clean
+

 
 

diff --git a/samples/png/pngdemo.cpp b/samples/png/pngdemo.cpp
index e28ab8a588f6214d3e1de61a01e9d6b5d72aceaa..8cc344029f3118f845397b061562e6f30c59a87d 100644 (file)
--- a/samples/png/pngdemo.cpp
+++ b/samples/png/pngdemo.cpp
@@ -178,10 +178,10 @@ void MyCanvas::OnPaint(wxPaintEvent& WXUNUSED(event))
   if ( g_TestBitmap && g_TestBitmap->Ok() )
   {
     wxMemoryDC memDC;
   if ( g_TestBitmap && g_TestBitmap->Ok() )
   {
     wxMemoryDC memDC;

-    if ( g_TestBitmap->GetColourMap() )
+    if ( g_TestBitmap->GetPalette() )

     {
     {

-        memDC.SetPalette(* g_TestBitmap->GetColourMap());
-        dc.SetPalette(* g_TestBitmap->GetColourMap());
+        memDC.SetPalette(* g_TestBitmap->GetPalette());
+        dc.SetPalette(* g_TestBitmap->GetPalette());

     }
     memDC.SelectObject(* g_TestBitmap);
 
     }
     memDC.SelectObject(* g_TestBitmap);