X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/140316c27863b729b4d468bab01298e49eb4ef80..65fb4b3a4f18e1d8b58ac92d50d4cc7f81f03783:/samples/html/about/about.cpp diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index 282eb37835..22ebb1555c 100644 --- a/samples/html/about/about.cpp +++ b/samples/html/about/about.cpp @@ -1,6 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.cpp -// Purpose: wxHtml testing example +// Name: about.cpp +// Purpose: wxHtml sample: about dialog test +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -21,6 +27,11 @@ #include "wx/wxhtml.h" #include "wx/statline.h" +#ifndef wxHAS_IMAGES_IN_RESOURCES + #include "../../sample.xpm" +#endif + + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -85,6 +96,9 @@ IMPLEMENT_APP(MyApp) // `Main program' equivalent: the program execution "starts" here bool MyApp::OnInit() { + if ( !wxApp::OnInit() ) + return false; + // we use a PNG image in our HTML page wxImage::AddHandler(new wxPNGHandler); @@ -106,6 +120,8 @@ bool MyApp::OnInit() MyFrame::MyFrame(const wxString& title) : wxFrame((wxFrame *)NULL, wxID_ANY, title) { + SetIcon(wxICON(sample)); + // create a menu bar wxMenu *menuFile = new wxMenu;