X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c990ba6d4f88e18e6666f61efe55c7a8b5cc948..6ab5d4883f3b51e88ccdd3b59fb0e000b3b6ad0f:/samples/html/htmlctrl/htmlctrl.cpp

diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp
index 58d01fbc2f..055a977795 100755
--- a/samples/html/htmlctrl/htmlctrl.cpp
+++ b/samples/html/htmlctrl/htmlctrl.cpp
@@ -25,12 +25,12 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
-// need because it includes almost all "standard" wxWindows headers)
+// need because it includes almost all "standard" wxWidgets headers)
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 
-#include "wx/html/wxWebKit.h"
+#include "wx/html/webkit.h"
 
 // ----------------------------------------------------------------------------
 // resources
@@ -86,18 +86,18 @@ public:
     void OnViewSource(wxCommandEvent& myEvent);
     void OnSetSource(wxCommandEvent& myEvent);
     void OnStateChanged(wxWebKitStateChangedEvent& myEvent);
-    wxWebKitControl* mySafari;
+    wxWebKitCtrl* mySafari;
     wxTextCtrl* urlText;
 private:
-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro
     DECLARE_EVENT_TABLE()
 };
 
 // ----------------------------------------------------------------------------
-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets
 // ----------------------------------------------------------------------------
 
-// the event tables connect the wxWindows events with the functions (event
+// the event tables connect the wxWidgets events with the functions (event
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
@@ -113,7 +113,7 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame)
     //EVT_MENU(Minimal_About, MyFrame::OnAbout)
 END_EVENT_TABLE()
 
-// Create a new application object: this macro will allow wxWindows to create
+// Create a new application object: this macro will allow wxWidgets to create
 // the application object during program execution (it's better than using a
 // static object for many reasons) and also implements the accessor function
 // wxGetApp() which will return the reference of the right type (i.e. MyApp and
@@ -153,14 +153,14 @@ MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(500,500))
 {
     wxMenuBar* myBar = new wxMenuBar();
-    wxMenu* fileMenu = new wxMenu(_("&File"));
-    fileMenu->Append(ID_OPEN, _("Open"));
-    fileMenu->Append(ID_SAVE, _("Save"));
-    myBar->Append(fileMenu, _("File"));
+    wxMenu* fileMenu = new wxMenu;
+    fileMenu->Append(ID_OPEN, _("&Open"));
+    fileMenu->Append(ID_SAVE, _("&Save"));
+    myBar->Append(fileMenu, _("&File"));
     
-    wxMenu* editMenu = new wxMenu(_("Edit"));
+    wxMenu* editMenu = new wxMenu;
     editMenu->Append(ID_SET_SOURCE, _("Set Page Source"));
-    myBar->Append(editMenu, _("Edit"));
+    myBar->Append(editMenu, _("&Edit"));
     
     //wxMenu* viewMenu = new wxMenu(_("View"));
     //viewMenu->Append(ID_VIEW_SOURCE, _("View Source"));
@@ -186,7 +186,7 @@ MyFrame::MyFrame(const wxString& title)
     myToolbar->AddSeparator();
     myToolbar->Realize();
 
-    mySafari = new wxWebKitControl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
+    mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200));
 
 #if wxUSE_STATUSBAR
     CreateStatusBar(2);
@@ -219,6 +219,7 @@ void MyFrame::OnStateChanged(wxWebKitStateChangedEvent& myEvent){
     if (GetStatusBar() != NULL){
         if (myEvent.GetState() == wxWEBKIT_STATE_NEGOTIATING){
             GetStatusBar()->SetStatusText(_("Contacting ") + myEvent.GetURL());
+            urlText->SetValue(myEvent.GetURL());
         }
         else if (myEvent.GetState() == wxWEBKIT_STATE_TRANSFERRING){
             GetStatusBar()->SetStatusText(_("Loading ") + myEvent.GetURL());
@@ -241,7 +242,7 @@ void MyFrame::OnViewSource(wxCommandEvent& myEvent){
 
 void MyFrame::OnSetSource(wxCommandEvent& myEvent){
     if (mySafari){
-        wxString myText = wxString("<HTML><HEAD></HEAD><BODY><P>Hello world!</P></BODY></HTML>");
+        wxString myText = wxT("<HTML><HEAD></HEAD><BODY><P>Hello world!</P></BODY></HTML>");
         mySafari->SetPageSource(myText);
     }
 }