X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/880efa2a137ce3e3f39236d0dc85f5d2dacdda12..7447d53c35249d42128d6243c90998f03882859a:/docs/doxygen/overviews/bitmap.h diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h index 0b9f20d5b9..2a375ca777 100644 --- a/docs/doxygen/overviews/bitmap.h +++ b/docs/doxygen/overviews/bitmap.h @@ -3,7 +3,7 @@ // Purpose: topic overview // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -33,7 +33,7 @@ include the XPM inline as below, since it's C code, or you can load it at run-time. @code -#include "mondrian.xpm" +#include "sample.xpm" @endcode Sometimes you wish to use a .ico resource on Windows, and XPMs on other @@ -44,16 +44,16 @@ A macro, wxICON(), is available which creates an icon using an XPM on the appropriate platform, or an icon resource on Windows: @code -wxIcon icon(wxICON(mondrian)); +wxIcon icon(wxICON(sample)); // The above line is equivalent to this: #if defined(__WXGTK__) || defined(__WXMOTIF__) - wxIcon icon(mondrian_xpm); + wxIcon icon(sample_xpm); #endif #if defined(__WXMSW__) - wxIcon icon("mondrian"); + wxIcon icon("sample"); #endif @endcode @@ -70,7 +70,7 @@ wxBitmap bmp(wxBITMAP(bmpname)); // which is roughly equivalent to the following #if defined(__WXMSW__) || defined(__WXPM__) - wxBitmap bmp("bmpname", wxBITMAP_TYPE_RESOURCE); + wxBitmap bmp("bmpname", wxBITMAP_TYPE_BMP_RESOURCE); #else // Unix wxBitmap bmp(bmpname_xpm, wxBITMAP_TYPE_XPM); #endif