don't generate an endless stream of asserts for the 0-sized images

[wxWidgets.git] / samples / html / test / test.cpp

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 0bbf21fd5f8436828f18afded2d9a96e5f82d574..4519cfe8989c9de3c0d7b61c5fc9a5a1b00f2daa 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -9,7 +9,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
     #pragma hdrstop
 
 #ifdef __BORLANDC__
     #pragma hdrstop


@@ -18,10 +18,11 @@
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWindows headers
 #ifndef WX_PRECOMP

-    #include <wx/wx.h>
+    #include "wx/wx.h"

 #endif
 
 #include "wx/image.h"
 #endif
 
 #include "wx/image.h"

+#include "wx/sysopt.h"

 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/fs_inet.h"
 #include "wx/html/htmlwin.h"
 #include "wx/html/htmlproc.h"
 #include "wx/fs_inet.h"


@@ -130,12 +131,14 @@ class BoldProcessor : public wxHtmlProcessor
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {

-     wxLog::AddTraceMask(wxT("strconv"));
-   
+#if wxUSE_SYSTEM_OPTIONS
+     wxSystemOptions::SetOption(wxT("no-maskblt"), 1);
+#endif
+

      wxInitAllImageHandlers();
      wxInitAllImageHandlers();

-     #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
+#if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS

      wxFileSystem::AddHandler(new wxInternetFSHandler);
      wxFileSystem::AddHandler(new wxInternetFSHandler);

-     #endif
+#endif

 
       SetVendorName("wxWindows");
       SetAppName("wxHtmlTest"); 
 
       SetVendorName("wxWindows");
       SetAppName("wxHtmlTest");