Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some more SetIcon() calls added; cleanup indentation of some samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58745 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2009-02-08 01:20:35 +00:00
parent 41f02b9acc
commit 197ab43d72
10 changed files with 356 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
samples/html/htmlctrl/htmlctrl.cpp
View File

@@ -32,6 +32,10 @@
#include "wx/html/webkit.h"
#ifndef __WXMSW__
#include "../../sample.xpm"
#endif
// ----------------------------------------------------------------------------
// resources
// ----------------------------------------------------------------------------
@@ -47,7 +51,7 @@ enum {
ID_OPEN = wxID_HIGHEST + 8,
ID_SAVE = wxID_HIGHEST + 9,
ID_SET_SOURCE = wxID_HIGHEST + 10
};
};
// ----------------------------------------------------------------------------
// private classes
@@ -149,20 +153,22 @@ bool MyApp::OnInit()
MyFrame::MyFrame(const wxString& title)
: wxFrame(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(500,500))
{
SetIcon(wxICON(sample));
wxMenuBar* myBar = new wxMenuBar();
wxMenu* fileMenu = new wxMenu;
fileMenu->Append(ID_OPEN, _("&Open"));
fileMenu->Append(ID_SAVE, _("&Save"));
myBar->Append(fileMenu, _("&File"));
wxMenu* editMenu = new wxMenu;
editMenu->Append(ID_SET_SOURCE, _("Set Page Source"));
myBar->Append(editMenu, _("&Edit"));
//wxMenu* viewMenu = new wxMenu(_("View"));
//viewMenu->Append(ID_VIEW_SOURCE, _("View Source"));
//myBar->Append(viewMenu, _("View"));
SetMenuBar(myBar);
wxToolBar* myToolbar = CreateToolBar();
@@ -200,7 +206,7 @@ MyFrame::MyFrame(const wxString& title)
#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