don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 59b006e2bbb17eaf768f9549b1de7274ef4c7848..e30905a82b09a0d54a1ecd8cb1046e8d25095026 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -30,6 +30,7 @@
 #include "wx/utils.h"
 #include "wx/clipbrd.h"
 #include "wx/dataobj.h"
+#include "wx/stopwatch.h"
 
 #include "../../sample.xpm"
 
@@ -60,7 +61,7 @@ private:
 #if wxUSE_CLIPBOARD
     DECLARE_EVENT_TABLE()
 #endif // wxUSE_CLIPBOARD
-    DECLARE_NO_COPY_CLASS(MyHtmlWindow)
+    wxDECLARE_NO_COPY_CLASS(MyHtmlWindow);
 };
 
 // Define a new frame type: this is going to be our main frame
@@ -192,7 +193,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     wxMenu *menuFile = new wxMenu;
     wxMenu *menuNav = new wxMenu;
 
-    menuFile->Append(ID_PageOpen, _("&Open HTML page..."));
+    menuFile->Append(ID_PageOpen, _("&Open HTML page...\tCtrl-O"));
     menuFile->Append(ID_DefaultLocalBrowser, _("&Open current page with default browser"));
     menuFile->Append(ID_DefaultWebBrowser, _("Open a &web page with default browser"));
     menuFile->AppendSeparator();
@@ -233,7 +234,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_Html = new MyHtmlWindow(this);
     m_Html->SetRelatedFrame(this, _("HTML : %s"));
 #if wxUSE_STATUSBAR
-    m_Html->SetRelatedStatusBar(0);
+    m_Html->SetRelatedStatusBar(1);
 #endif // wxUSE_STATUSBAR
     m_Html->ReadCustomization(wxConfig::Get());
     m_Html->LoadFile(wxFileName(wxT("test.htm")));
@@ -270,7 +271,15 @@ void MyFrame::OnPageOpen(wxCommandEvent& WXUNUSED(event))
         wxEmptyString, wxEmptyString, wxT("HTML files|*.htm;*.html"));
 
     if (!p.empty())
+    {
+#if wxUSE_STOPWATCH
+        wxStopWatch sw;
+#endif
         m_Html->LoadFile(wxFileName(p));
+#if wxUSE_STOPWATCH
+        wxLogStatus("Loaded \"%s\" in %lums", p, sw.Time());
+#endif
+    }
 #endif // wxUSE_FILEDLG
 }
 
@@ -358,7 +367,7 @@ void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
     if ( CopySelection() )
     {
         wxTextDataObject data;
-        if ( wxTheClipboard && wxTheClipboard->GetData(data) )
+        if ( wxTheClipboard && wxTheClipboard->Open() && wxTheClipboard->GetData(data) )
         {
             const wxString text = data.GetText();
             const size_t maxTextLength = 100;
@@ -367,6 +376,8 @@ void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
                         wxString(text, maxTextLength).c_str(),
                         (text.length() > maxTextLength) ? _T("...")
                                                         : _T("")));
+            wxTheClipboard->Close();
+
             return;
         }
     }