wxMessageBox off the main thread lost result code.

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

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index cd470a349177dbcd43cfa5d8d69bfc52c6b05414..5de91113800d00a6b0abf1b5fe65c816efb2e973 100644 (file)
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart / Kevin Ollivier
 // Modified by:
 // Created:     04/16/2004
 // Author:      Julian Smart / Kevin Ollivier
 // Modified by:
 // Created:     04/16/2004

-// RCS-ID:      $Id$

 // Copyright:   (c) Julian Smart / Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Julian Smart / Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -32,7 +31,7 @@
 
 #include "wx/html/webkit.h"
 
 
 #include "wx/html/webkit.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 


@@ -133,7 +132,7 @@ bool MyApp::OnInit()
         return false;
 
     // create the main application window
         return false;
 
     // create the main application window

-    MyFrame *frame = new MyFrame(_T("wxWebKit Sample"));
+    MyFrame *frame = new MyFrame(wxT("wxWebKit Sample"));

 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)
 
     // and show it (the frames, unlike simple controls, are not shown when
     // created initially)


@@ -184,7 +183,7 @@ MyFrame::MyFrame(const wxString& title)
     wxButton* btnReload = new wxButton(myToolbar, ID_RELOAD, _("Reload"));
     myToolbar->AddControl(btnReload);
     myToolbar->AddSeparator();
     wxButton* btnReload = new wxButton(myToolbar, ID_RELOAD, _("Reload"));
     myToolbar->AddControl(btnReload);
     myToolbar->AddSeparator();

-    urlText = new wxTextCtrl(myToolbar, ID_URLLIST, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(220, -1), wxTE_PROCESS_ENTER);
+    urlText = new wxTextCtrl(myToolbar, ID_URLLIST, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(220, -1), wxTE_PROCESS_ENTER);

     myToolbar->AddControl(urlText);
     myToolbar->AddSeparator();
     myToolbar->Realize();
     myToolbar->AddControl(urlText);
     myToolbar->AddSeparator();
     myToolbar->Realize();


@@ -196,7 +195,7 @@ MyFrame::MyFrame(const wxString& title)
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
     panel->SetSizer(boxSizer);
 
     wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL);
     panel->SetSizer(boxSizer);
 

-    mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+    mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));

 
     boxSizer->Add(mySafari, 1, wxEXPAND);
 
 
     boxSizer->Add(mySafari, 1, wxEXPAND);
 


@@ -204,7 +203,7 @@ MyFrame::MyFrame(const wxString& title)
     SetSizer(frameSizer);
     frameSizer->Add(panel, 1, wxEXPAND);
 #else
     SetSizer(frameSizer);
     frameSizer->Add(panel, 1, wxEXPAND);
 #else

-    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, wxT("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));

 #endif
 
 #if wxUSE_STATUSBAR
 #endif
 
 #if wxUSE_STATUSBAR