Moved the popup menu event handlers to dialog event handler

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index cd299a8bf38d8947bc002cff69227947541e7ef6..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".
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #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
-    #include <wx/wx.h>
+    #include "wx/wx.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"
@@ -131,11 +132,14 @@ class BoldProcessor : public wxHtmlProcessor
    bool MyApp::OnInit()
    {
      wxLog::AddTraceMask(wxT("strconv"));
-   
+#if wxUSE_SYSTEM_OPTIONS
+     wxSystemOptions::SetOption(wxT("no-maskblt"), 1);
+#endif
+
      wxInitAllImageHandlers();
-     #if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
+#if wxUSE_FS_INET && wxUSE_STREAMS && wxUSE_SOCKETS
      wxFileSystem::AddHandler(new wxInternetFSHandler);
-     #endif
+#endif
 
       SetVendorName("wxWindows");
       SetAppName("wxHtmlTest"); 
@@ -212,7 +216,7 @@ void MyFrame::OnQuit(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);
 }