added tracing of ReleaseMouse and assertion to prevent releasing window with mouse...

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 8b09f06aaa746119cf4fc6ce7f7dd4904bcf85d2..f2e0692957b372eec2d81a4ff509053d4819383c 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,13 +18,15 @@
 // 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
 
 #endif
 

-#include <wx/image.h>
-#include <wx/html/htmlwin.h>
-#include <wx/html/htmlproc.h>
-#include <wx/fs_inet.h>
+#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/filedlg.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -129,10 +131,15 @@ 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"); 


@@ -209,7 +216,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
 {
 
 void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
 {

-  wxString p = wxFileSelector("Open HTML document", "", "", "", "HTML files|*.htm");
+  wxString p = wxFileSelector(wxT("Open HTML document"), wxT(""), wxT(""), wxT(""), wxT("HTML files|*.htm"));

   if (p != wxEmptyString)
     m_Html -> LoadPage(p);
 }
   if (p != wxEmptyString)
     m_Html -> LoadPage(p);
 }