Remove call to gtk_pizza_set_clear, which doesn't exist any more.

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 6bde933e5588733b912cd53e9121984cba4036f8..c726b60907fdca1f5637c4f58978268baab8c69e 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -32,6 +27,7 @@
 #include "wx/html/htmlproc.h"
 #include "wx/fs_inet.h"
 #include "wx/filedlg.h"
+#include "wx/utils.h"
 
 #include "../../sample.xpm"
 
@@ -70,6 +66,7 @@ public:
     // event handlers (these functions should _not_ be virtual)
     void OnQuit(wxCommandEvent& event);
     void OnPageOpen(wxCommandEvent& event);
+    void OnDefaultBrowser(wxCommandEvent& event);
     void OnBack(wxCommandEvent& event);
     void OnForward(wxCommandEvent& event);
     void OnProcessor(wxCommandEvent& event);
@@ -107,6 +104,7 @@ enum
 {
     // menu items
     ID_PageOpen = wxID_HIGHEST,
+    ID_DefaultBrowser,
     ID_Back,
     ID_Forward,
     ID_Processor
@@ -119,6 +117,7 @@ enum
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     EVT_MENU(wxID_EXIT,  MyFrame::OnQuit)
     EVT_MENU(ID_PageOpen, MyFrame::OnPageOpen)
+    EVT_MENU(ID_DefaultBrowser, MyFrame::OnDefaultBrowser)
     EVT_MENU(ID_Back, MyFrame::OnBack)
     EVT_MENU(ID_Forward, MyFrame::OnForward)
     EVT_MENU(ID_Processor, MyFrame::OnProcessor)
@@ -173,6 +172,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuNav = new wxMenu;
 
     menuFile->Append(ID_PageOpen, _("&Open HTML page..."));
+    menuFile->Append(ID_DefaultBrowser, _("&Open current page with default browser"));
     menuFile->AppendSeparator();
     menuFile->Append(ID_Processor, _("&Remove bold attribute"),
                      wxEmptyString, wxITEM_CHECK);
@@ -232,11 +232,22 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
 {
+#if wxUSE_FILEDLG
     wxString p = wxFileSelector(_("Open HTML document"), wxEmptyString,
-        wxEmptyString, wxEmptyString, wxT("HTML files|*.htm"));
+        wxEmptyString, wxEmptyString, wxT("HTML files|*.htm;*.html"));
+
+    if (!p.empty())
+        m_Html->LoadFile(wxFileName(p));
+#endif // wxUSE_FILEDLG
+}
 
-    if (p != wxEmptyString)
-        m_Html->LoadPage(p);
+void MyFrame::OnDefaultBrowser(wxCommandEvent& WXUNUSED(event))
+{
+    wxString page = m_Html->GetOpenedPage();
+    if (!page.empty())
+    {
+        wxLaunchDefaultBrowser(page);
+    }
 }
 
 void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))