X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d2976ad6b56ff1650e15f2b949c10ec92385309..1e9693318372b3321c400fc7a1746bbcd696eceb:/docs/latex/wx/filetype.tex

diff --git a/docs/latex/wx/filetype.tex b/docs/latex/wx/filetype.tex
index c76595f4b2..c90d97cfad 100644
--- a/docs/latex/wx/filetype.tex
+++ b/docs/latex/wx/filetype.tex
@@ -7,13 +7,13 @@ object may be created in several different ways: the program might know the file
 extension and wish to find out the corresponding MIME type or, conversely, it
 might want to find the right extension for the file to which it writes the
 contents of given MIME type. Depending on how it was created some fields may be
-unknown so the return value of all the accessors {\bf must} be checked: FALSE
+unknown so the return value of all the accessors {\bf must} be checked: {\tt false}
 will be returned if the corresponding information couldn't be found.
 
 The objects of this class are never created by the application code but are
 returned by \helpref{wxMimeTypesManager::GetFileTypeFromMimeType}{wxmimetypesmanagergetfiletypefrommimetype} and 
 \helpref{wxMimeTypesManager::GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension} methods.
-But it's your responsibility to delete the returned pointer when you're done
+But it is your responsibility to delete the returned pointer when you're done
 with it!
 
 % TODO describe MIME types better than this...
@@ -56,7 +56,7 @@ These parameters may be useful to the program used to open, edit, view or print
 the message, so, for example, an e-mail client program will have to pass them to
 this program. Because wxFileType itself can not know about these parameters,
 it uses MessageParameters class to query them. The default implementation only
-requiers the caller to provide the file name (always used by the program to be
+requires the caller to provide the file name (always used by the program to be
 called - it must know which file to open) and the MIME type and supposes that
 there are no other parameters. If you wish to supply additional parameters, you
 must derive your own class from MessageParameters and override GetParamValue()
@@ -90,7 +90,7 @@ Now you only need to create an object of this class and pass it to, for example,
 \begin{verbatim}
 wxString command;
 if ( filetype->GetOpenCommand(&command,
-                              MailMessageParamaters("foo.txt", "text/plain")) )
+                              MailMessageParameters("foo.txt", "text/plain")) )
 {
     // the full command for opening the text documents is in 'command'
     // (it might be "notepad foo.txt" under Windows or "cat foo.txt" under Unix)
@@ -122,12 +122,12 @@ The destructor of this class is not virtual, so it should not be derived from.
 
 \func{bool}{GetMimeType}{\param{wxString*}{ mimeType}}
 
-If the function returns TRUE, the string pointed to by {\it mimeType} is filled
+If the function returns {\tt true}, the string pointed to by {\it mimeType} is filled
 with full MIME type specification for this file type: for example, "text/plain".
 
 \membersection{wxFileType::GetMimeTypes}\label{wxfiletypegetmimetypes}
 
-\func{bool}{GetMimeType}{\param{wxArrayString&}{ mimeTypes}}
+\func{bool}{GetMimeType}{\param{wxArrayString\&}{ mimeTypes}}
 
 Same as \helpref{GetMimeType}{wxfiletypegetmimetype} but returns array of MIME
 types. This array will contain only one item in most cases but sometimes,
@@ -139,23 +139,29 @@ mime.types.
 
 \func{bool}{GetExtensions}{\param{wxArrayString\&}{ extensions}}
 
-If the function returns TRUE, the array {\it extensions} is filled
+If the function returns {\tt true}, the array {\it extensions} is filled
 with all extensions associated with this file type: for example, it may
 contain the following two elements for the MIME type "text/html" (notice the
 absence of the leading dot): "html" and "htm".
 
 {\bf Windows:} This function is currently not implemented: there is no
 (efficient) way to retrieve associated extensions from the given MIME type on
-this platform, so it will only return TRUE if the wxFileType object was created
+this platform, so it will only return {\tt true} if the wxFileType object was created
 by \helpref{GetFileTypeFromExtension}{wxmimetypesmanagergetfiletypefromextension} 
 function in the first place.
 
 \membersection{wxFileType::GetIcon}\label{wxfiletypegeticon}
 
-\func{bool}{GetIcon}{\param{wxIcon*}{ icon}}
+\func{bool}{GetIcon}{\param{wxIconLocation *}{ iconLoc}}
 
-If the function returns TRUE, the icon associated with this file type will be
-created and assigned to the {\it icon} parameter.
+If the function returns {\tt true}, the {\tt iconLoc} is filled with the
+location of the icon for this MIME type. A \helpref{wxIcon}{wxicon} may be
+created from {\it iconLoc} later.
+
+{\bf Windows:} The function returns the icon shown by Explorer for the files of
+the specified type.
+
+{\bf Mac:} This function is not implemented and always returns {\tt false}.
 
 {\bf Unix:} MIME manager gathers information about icons from GNOME
 and KDE settings and thus GetIcon's success depends on availability
@@ -165,7 +171,7 @@ of these desktop environments.
 
 \func{bool}{GetDescription}{\param{wxString*}{ desc}}
 
-If the function returns TRUE, the string pointed to by {\it desc} is filled
+If the function returns {\tt true}, the string pointed to by {\it desc} is filled
 with a brief description for this file type: for example, "text document" for
 the "text/plain" MIME type.
 
@@ -173,16 +179,25 @@ the "text/plain" MIME type.
 
 \func{bool}{GetOpenCommand}{\param{wxString*}{ command}, \param{MessageParameters\&}{ params}}
 
-If the function returns TRUE, the string pointed to by {\it command} is filled
-with the command which must be executed (see \helpref{wxExecute}{wxexecute}) in
-order to open the file of the given type. The name of the file is
-retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
+\func{wxString}{GetOpenCommand}{\param{const wxString\&}{ filename}}
+
+With the first version of this method, if the {\tt true} is returned, the
+string pointed to by {\it command} is filled with the command which must be
+executed (see \helpref{wxExecute}{wxexecute}) in order to open the file of the
+given type. In this case, the name of the file as well as any other parameters
+is retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} 
+class.
+
+In the second case, only the filename is specified and the command to be used
+to open this kind of file is returned directly. An empty string is returned to
+indicate that an error occurred (typically meaning that there is no standard way
+to open this kind of files).
 
 \membersection{wxFileType::GetPrintCommand}\label{wxfiletypegetprintcommand}
 
 \func{bool}{GetPrintCommand}{\param{wxString*}{ command},\param{MessageParameters\&}{ params}}
 
-If the function returns TRUE, the string pointed to by {\it command} is filled
+If the function returns {\tt true}, the string pointed to by {\it command} is filled
 with the command which must be executed (see \helpref{wxExecute}{wxexecute}) in
 order to print the file of the given type. The name of the file is
 retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
@@ -191,15 +206,15 @@ retrieved from \helpref{MessageParameters}{wxfiletypemessageparameters} class.
 
 \func{static wxString}{ExpandCommand}{\param{const wxString\&}{ command}, \param{MessageParameters\&}{ params}}
 
-This function is primarly intended for GetOpenCommand and GetPrintCommand
+This function is primarily intended for GetOpenCommand and GetPrintCommand
 usage but may be also used by the application directly if, for example, you want
-to use some non default command to open the file.
+to use some non-default command to open the file.
 
-The function replaces all occurences of
+The function replaces all occurrences of
 
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
-\twocolitem{format specificator}{with}
+\twocolitem{format specification}{with}
 \twocolitem{\%s}{the full file name}
 \twocolitem{\%t}{the MIME type}
 \twocolitem{\%\{param\}}{the value of the parameter {\it param}}