X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/52fa6f7d168cf8186fecda8c681ed4a20156cb0a..da98e15760bfcad41a5579e64955caadc2e535f3:/samples/html/widget/widget.cpp diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp index 697edfc3f3..705b1e39b3 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: virtua;.cpp +// Name: widget.cpp // Purpose: wxHtml testing example -// demonstrates virtual file systems feature +// Demonstrates embedded controls ///////////////////////////////////////////////////////////////////////////// #if defined(__GNUG__) && !defined(__APPLE__) @@ -25,6 +25,8 @@ #include "wx/html/htmlwin.h" +#include "../../sample.xpm" + /* @@ -154,7 +156,7 @@ bool MyApp::OnInit() { // Create the main application window MyFrame *frame = new MyFrame( _("wxHtmlWindow testing application"), - wxPoint(50, 50), wxSize(640, 480) ); + wxDefaultPosition, wxSize(640, 480) ); // Show it and tell the application that it's our main window // @@@ what does it do exactly, in fact? is it necessary here? @@ -193,12 +195,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) // ... and attach this menu bar to the frame SetMenuBar(menuBar); + SetIcon(wxIcon(sample_xpm)); + +#if wxUSE_STATUSBAR CreateStatusBar(2); +#endif // wxUSE_STATUSBAR html = new wxHtmlWindow(this); - html -> SetRelatedFrame(this, _("VFS Demo: '%s'")); + html -> SetRelatedFrame(this, _("wxHTML Demo: '%s'")); +#if wxUSE_STATUSBAR html -> SetRelatedStatusBar(1); +#endif // wxUSE_STATUSBAR html -> LoadPage(wxT("start.htm")); + }