Undid accidental modification of wxTaskBarIcon in the last commit.

[wxWidgets.git] / docs / doxygen / overviews / bitmap.h

diff --git a/docs/doxygen/overviews/bitmap.h b/docs/doxygen/overviews/bitmap.h
index 0b9f20d5b9c9ba183915edf6c62d9d72fc3b8867..2a375ca777cc32fffa97658f4b74a0ac0817c734 100644 (file)
--- 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