X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a660d684eda27638bca0384b2058911a31c8e845..6244848856584171db8cd74a7ff227250e46cc54:/docs/latex/wx/bitmap.tex?ds=inline diff --git a/docs/latex/wx/bitmap.tex b/docs/latex/wx/bitmap.tex index 30a202a37e..f847a82bf0 100644 --- a/docs/latex/wx/bitmap.tex +++ b/docs/latex/wx/bitmap.tex @@ -24,20 +24,18 @@ Default constructor. \func{}{wxBitmap}{\param{const wxBitmap\& }{bitmap}} -\func{}{wxBitmap}{\param{const wxBitmap* }{bitmap}} +Copy constructor. -Copy constructors. - -\func{}{wxBitmap}{\param{void*}{ data}, \param{const int}{ type}, \param{const int}{ width}, \param{const int}{ height}, \param{const int}{ depth = -1}} +\func{}{wxBitmap}{\param{void*}{ data}, \param{int}{ type}, \param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} Creates a bitmap from the given data, which can be of arbitrary type. -\func{}{wxBitmap}{\param{const char}{ bits[]}, \param{const int}{ width}, \param{const int}{ height}\\ - \param{const int}{ depth = 1}} +\func{}{wxBitmap}{\param{const char}{ bits[]}, \param{int}{ width}, \param{int}{ height}\\ + \param{int}{ depth = 1}} Creates a bitmap from an array of bits. -\func{}{wxBitmap}{\param{const int}{ width}, \param{const int}{ height}, \param{const int}{ depth = -1}} +\func{}{wxBitmap}{\param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} Creates a new bitmap. @@ -45,7 +43,7 @@ Creates a new bitmap. Creates a bitmap from XPM data. -\func{}{wxBitmap}{\param{const wxString\& }{name}, \param{const long}{ type}} +\func{}{wxBitmap}{\param{const wxString\& }{name}, \param{long}{ type}} Loads a bitmap from a file or resource. @@ -61,7 +59,7 @@ Loads a bitmap from a file or resource. screen is used.} \docparam{name}{This can refer to a resource name under MS Windows, or a filename under MS Windows and X. -Its meaning is determined by the {\it flags} parameter.} +Its meaning is determined by the {\it type} parameter.} \docparam{type}{May be one of the following: @@ -158,12 +156,12 @@ This function is called by wxWindows on exit. \membersection{wxBitmap::Create} -\func{virtual bool}{Create}{\param{const int}{ width}, \param{const int}{ height}, \param{const int}{ depth = -1}} +\func{virtual bool}{Create}{\param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} Creates a fresh bitmap. If the final argument is omitted, the display depth of the screen is used. -\func{virtual bool}{Create}{\param{void*}{ data}, \param{const int}{ type}, \param{const int}{ width}, \param{const int}{ height}, \param{const int}{ depth = -1}} +\func{virtual bool}{Create}{\param{void*}{ data}, \param{int}{ type}, \param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} Creates a bitmap from the given data, which can be of arbitrary type. @@ -259,7 +257,7 @@ or set for the bitmap. \constfunc{wxMask*}{GetMask}{\void} -Gets the associated mask if any) which may have been loaded from a file +Gets the associated mask (if any) which may have been loaded from a file or set for the bitmap. \wxheading{See also} @@ -304,7 +302,7 @@ of a given handler class in an application session.} \membersection{wxBitmap::LoadFile}\label{wxbitmaploadfile} -\func{bool}{LoadFile}{\param{const wxString\&}{ name}, \param{const long}{ type}} +\func{bool}{LoadFile}{\param{const wxString\&}{ name}, \param{long}{ type}} Loads a bitmap from a file or resource. @@ -556,7 +554,7 @@ Destroys the wxBitmapHandler object. \membersection{wxBitmapHandler::Create} -\func{virtual bool}{Create}{\param{wxBitmap* }{bitmap}, \param{void*}{ data}, \param{const int}{ type}, \param{const int}{ width}, \param{const int}{ height}, \param{const int}{ depth = -1}} +\func{virtual bool}{Create}{\param{wxBitmap* }{bitmap}, \param{void*}{ data}, \param{int}{ type}, \param{int}{ width}, \param{int}{ height}, \param{int}{ depth = -1}} Creates a bitmap from the given data, which can be of arbitrary type. The wxBitmap object {\it bitmap} is manipulated by this function. @@ -600,7 +598,7 @@ Gets the bitmap type associated with this handler. \membersection{wxBitmapHandler::LoadFile}\label{wxbitmaphandlerloadfile} -\func{bool}{LoadFile}{\param{wxBitmap* }{bitmap}, \param{const wxString\&}{ name}, \param{const long}{ type}} +\func{bool}{LoadFile}{\param{wxBitmap* }{bitmap}, \param{const wxString\&}{ name}, \param{long}{ type}} Loads a bitmap from a file or resource, putting the resulting data into {\it bitmap}.