Applied patch #484508 (mostly sample warnings).

I've no idea why CVS thinks that the .mcp files have been changed - they haven't.


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

samples/html/test/test.cpp

@@ -22,6 +22,7 @@
 #endif
 
 #include "wx/image.h"
+#include "wx/sysopt.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/fs_inet.h"
@@ -131,7 +132,8 @@ class BoldProcessor : public wxHtmlProcessor
    bool MyApp::OnInit()
    {
      wxLog::AddTraceMask(wxT("strconv"));
-   
+     wxSystemOptions::SetOption(wxT("no-maskblt"), 1);
+
      wxInitAllImageHandlers();
      #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
      wxFileSystem::AddHandler(new wxInternetFSHandler);