wxMessageBox off the main thread lost result code.

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

diff --git a/samples/html/test/test.cpp b/samples/html/test/test.cpp
index 6931da1ba3e11aaf5f75907ac6a3736b42529c50..64498d7c2ebaf1b55916832187678f98436cc322 100644 (file)
--- a/samples/html/test/test.cpp
+++ b/samples/html/test/test.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxHtml testing example
 // Author:      Vaclav Slavik
 // Created:     1999-07-07
-// RCS-ID:      $Id$
 // Copyright:   (c) Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -258,7 +257,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
     m_Html->LoadFile(wxFileName(wxT("test.htm")));
     m_Html->AddProcessor(m_Processor);
 
-    wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, _T(""),
+    wxTextCtrl *text = new wxTextCtrl(this, wxID_ANY, wxT(""),
                                       wxDefaultPosition, wxDefaultSize,
                                       wxTE_MULTILINE);
 
@@ -374,7 +373,7 @@ wxHtmlOpeningStatus MyHtmlWindow::OnOpeningURL(wxHtmlURLType WXUNUSED(type),
                                                const wxString& url,
                                                wxString *WXUNUSED(redirect)) const
 {
-    GetRelatedFrame()->SetStatusText(url + _T(" lately opened"),1);
+    GetRelatedFrame()->SetStatusText(url + wxT(" lately opened"),1);
     return wxHTML_OPEN;
 }
 
@@ -398,17 +397,17 @@ void MyHtmlWindow::OnClipboardEvent(wxClipboardTextEvent& WXUNUSED(event))
             const wxString text = data.GetText();
             const size_t maxTextLength = 100;
 
-            wxLogStatus(wxString::Format(_T("Clipboard: '%s%s'"),
+            wxLogStatus(wxString::Format(wxT("Clipboard: '%s%s'"),
                         wxString(text, maxTextLength).c_str(),
-                        (text.length() > maxTextLength) ? _T("...")
-                                                        : _T("")));
+                        (text.length() > maxTextLength) ? wxT("...")
+                                                        : wxT("")));
             wxTheClipboard->Close();
 
             return;
         }
     }
 
-    wxLogStatus(_T("Clipboard: nothing"));
+    wxLogStatus(wxT("Clipboard: nothing"));
 }
 #endif // wxUSE_CLIPBOARD