X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2c990ba6d4f88e18e6666f61efe55c7a8b5cc948..21b2dde583e83d3ad455c20fa8db717037b5f548:/samples/html/htmlctrl/htmlctrl.cpp?ds=sidebyside diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp old mode 100755 new mode 100644 index 58d01fbc2f..c003f9cb19 --- a/samples/html/htmlctrl/htmlctrl.cpp +++ b/samples/html/htmlctrl/htmlctrl.cpp @@ -25,23 +25,17 @@ #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 // ---------------------------------------------------------------------------- -// the application icon (under Windows and OS/2 it is in resources and even -// though we could still include the XPM here it would be unused) -#if !defined(__WXMSW__) && !defined(__WXPM__) - #include "../../sample.xpm" -#endif - enum { ID_BACK = wxID_HIGHEST + 1, ID_NEXT = wxID_HIGHEST + 2, @@ -86,18 +80,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 +107,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 @@ -131,6 +125,9 @@ IMPLEMENT_APP(MyApp) // 'Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // create the main application window MyFrame *frame = new MyFrame(_T("wxWebKit Sample")); @@ -153,14 +150,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,8 +183,24 @@ MyFrame::MyFrame(const wxString& title) myToolbar->AddSeparator(); myToolbar->Realize(); - mySafari = new wxWebKitControl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200)); + // Testing wxWebKitCtrl inside a panel +#if 1 + wxPanel* panel = new wxPanel(this, wxID_ANY); + + wxBoxSizer* boxSizer = new wxBoxSizer(wxVERTICAL); + panel->SetSizer(boxSizer); + mySafari = new wxWebKitCtrl(panel, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200)); + + boxSizer->Add(mySafari, 1, wxEXPAND); + + wxBoxSizer* frameSizer = new wxBoxSizer(wxVERTICAL); + SetSizer(frameSizer); + frameSizer->Add(panel, 1, wxEXPAND); +#else + mySafari = new wxWebKitCtrl(this, ID_WEBKIT, _T("http://www.wxwidgets.org"), wxDefaultPosition, wxSize(200, 200)); +#endif + #if wxUSE_STATUSBAR CreateStatusBar(2); #endif // wxUSE_STATUSBAR @@ -208,7 +221,7 @@ void MyFrame::OnStopButton(wxCommandEvent& myEvent){ } void MyFrame::OnReloadButton(wxCommandEvent& myEvent){ - mySafari->Reload(); + mySafari->Reload(); } void MyFrame::OnURLEnter(wxCommandEvent& myEvent){ @@ -219,6 +232,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 +255,7 @@ void MyFrame::OnViewSource(wxCommandEvent& myEvent){ void MyFrame::OnSetSource(wxCommandEvent& myEvent){ if (mySafari){ - wxString myText = wxString("

Hello world!

"); + wxString myText = wxT("

Hello world!

"); mySafari->SetPageSource(myText); } }