some more SetIcon() calls added; cleanup indentation of some samples
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1,7 +1,12 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: widget.cpp
|
||||
// Purpose: wxHtml testing example
|
||||
// Demonstrates embedded controls
|
||||
// Name: zip.cpp
|
||||
// Purpose: wxHtml sample: Demonstrates embedded controls
|
||||
// Author: ?
|
||||
// Modified by:
|
||||
// Created: ?
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) wxWidgets team
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
// For compilers that support precompilation, includes "wx/wx.h".
|
||||
@@ -17,23 +22,17 @@
|
||||
#include "wx/wx.h"
|
||||
#endif
|
||||
|
||||
|
||||
#include "wx/html/htmlwin.h"
|
||||
|
||||
#include "../../sample.xpm"
|
||||
|
||||
|
||||
/*
|
||||
|
||||
|
||||
TAG HANDER FOR 'MYBIND' TAG
|
||||
|
||||
|
||||
*/
|
||||
// ----------------------------------------------------------------------------
|
||||
// TAG HANDER FOR 'MYBIND' TAG
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
#include "wx/html/m_templ.h"
|
||||
|
||||
|
||||
TAG_HANDLER_BEGIN(MYBIND, "MYBIND")
|
||||
|
||||
TAG_HANDLER_PROC(tag)
|
||||
@@ -182,8 +181,10 @@ wxHtmlWindow *html;
|
||||
|
||||
// frame constructor
|
||||
MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
|
||||
: wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size)
|
||||
{
|
||||
SetIcon(wxICON(sample));
|
||||
|
||||
// create a menu bar
|
||||
wxMenu *menuFile = new wxMenu;
|
||||
wxMenu *menuNav = new wxMenu;
|
||||
@@ -201,7 +202,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
|
||||
SetMenuBar(menuBar);
|
||||
|
||||
SetIcon(wxIcon(sample_xpm));
|
||||
|
||||
|
||||
#if wxUSE_STATUSBAR
|
||||
CreateStatusBar(2);
|
||||
#endif // wxUSE_STATUSBAR
|
||||
|
Reference in New Issue
Block a user