From 197ab43d72571ecfd86c35f1832f063237775648 Mon Sep 17 00:00:00 2001 From: Francesco Montorsi Date: Sun, 8 Feb 2009 01:20:35 +0000 Subject: [PATCH] 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 --- samples/html/about/about.cpp | 17 ++- samples/html/help/help.cpp | 209 ++++++++++++++------------- samples/html/helpview/helpview.cpp | 38 ++--- samples/html/htmlctrl/htmlctrl.cpp | 16 ++- samples/html/printing/printing.cpp | 90 +++++++----- samples/html/virtual/virtual.cpp | 220 +++++++++++++++-------------- samples/html/widget/widget.cpp | 29 ++-- samples/html/zip/zip.cpp | 18 ++- samples/mobile/styles/styles.cpp | 6 + samples/mobile/wxedit/wxedit.cpp | 6 + 10 files changed, 364 insertions(+), 285 deletions(-) diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp index 9613d9890f..9205f45996 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 __WXMSW__ + #include "../../sample.xpm" +#endif + + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -109,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; diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp index 062949c8cf..c1c2954466 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -1,6 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.cpp -// Purpose: wxHtml testing example +// Name: help.cpp +// Purpose: wxHtml sample: help test +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -22,55 +28,60 @@ #include "wx/filesys.h" #include "wx/fs_zip.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif + + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- // Define a new application type, each program should derive a class from wxApp - class MyApp : public wxApp - { - public: +class MyApp : public wxApp +{ +public: // override base class virtuals // ---------------------------- // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); - }; + virtual bool OnInit(); +}; // Define a new frame type: this is going to be our main frame - class MyFrame : public wxFrame - { - public: +class MyFrame : public wxFrame +{ +public: // ctor(s) - MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); + MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); // event handlers (these functions should _not_ be virtual) - void OnQuit(wxCommandEvent& event); - void OnHelp(wxCommandEvent& event); - void OnClose(wxCloseEvent& event); - private: - wxHtmlHelpController help; + void OnQuit(wxCommandEvent& event); + void OnHelp(wxCommandEvent& event); + void OnClose(wxCloseEvent& event); +private: + wxHtmlHelpController help; // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() - }; +}; // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- // IDs for the controls and the menu commands - enum - { +enum +{ // menu items - Minimal_Quit = 1, - Minimal_Help - }; + Minimal_Quit = 1, + Minimal_Help +}; // ---------------------------------------------------------------------------- // event tables and other macros for wxWidgets @@ -79,54 +90,54 @@ // 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) - EVT_MENU(Minimal_Quit, MyFrame::OnQuit) - EVT_MENU(Minimal_Help, MyFrame::OnHelp) - EVT_CLOSE(MyFrame::OnClose) - END_EVENT_TABLE() - - // 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 declares the accessor function - // wxGetApp() which will return the reference of the right type (i.e. MyApp and - // not wxApp) - IMPLEMENT_APP(MyApp) - - // ============================================================================ - // implementation - // ============================================================================ - - // ---------------------------------------------------------------------------- - // the application class - // ---------------------------------------------------------------------------- - // `Main program' equivalent: the program execution "starts" here - bool MyApp::OnInit() - { - if ( !wxApp::OnInit() ) - return false; - - wxInitAllImageHandlers(); +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU(Minimal_Quit, MyFrame::OnQuit) + EVT_MENU(Minimal_Help, MyFrame::OnHelp) + EVT_CLOSE(MyFrame::OnClose) +END_EVENT_TABLE() + +// 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 declares the accessor function +// wxGetApp() which will return the reference of the right type (i.e. MyApp and +// not wxApp) +IMPLEMENT_APP(MyApp) + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// the application class +// ---------------------------------------------------------------------------- +// `Main program' equivalent: the program execution "starts" here +bool MyApp::OnInit() +{ + if ( !wxApp::OnInit() ) + return false; + + wxInitAllImageHandlers(); #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB - wxFileSystem::AddHandler(new wxZipFSHandler); + wxFileSystem::AddHandler(new wxZipFSHandler); #endif - SetVendorName(wxT("wxWidgets")); - SetAppName(wxT("wxHTMLHelp")); + SetVendorName(wxT("wxWidgets")); + SetAppName(wxT("wxHTMLHelp")); // Create the main application window - MyFrame *frame = new MyFrame(_("HTML Help Sample"), - wxDefaultPosition, wxDefaultSize); + MyFrame *frame = new MyFrame(_("HTML Help Sample"), + wxDefaultPosition, wxDefaultSize); // Show it and tell the application that it's our main window // @@@ what does it do exactly, in fact? is it necessary here? - frame->Show(true); - SetTopWindow(frame); + frame->Show(true); + SetTopWindow(frame); // success: wxApp::OnRun() will be called which will enter the main message // loop and the application will run. If we returned false here, the // application would exit immediately. - return true; - } + return true; +} // ---------------------------------------------------------------------------- // main frame @@ -134,62 +145,60 @@ // frame constructor - MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), - help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES) - { +MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size), + help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES) +{ + SetIcon(wxICON(sample)); + // create a menu bar - wxMenu *menuFile = new wxMenu; + wxMenu *menuFile = new wxMenu; - menuFile->Append(Minimal_Help, _("&Help")); - menuFile->Append(Minimal_Quit, _("E&xit")); + menuFile->Append(Minimal_Help, _("&Help")); + menuFile->Append(Minimal_Quit, _("E&xit")); // now append the freshly created menu to the menu bar... - wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, _("&File")); + wxMenuBar *menuBar = new wxMenuBar; + menuBar->Append(menuFile, _("&File")); // ... and attach this menu bar to the frame - SetMenuBar(menuBar); + SetMenuBar(menuBar); - help.UseConfig(wxConfig::Get()); - bool ret; - help.SetTempDir(wxT(".")); - ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX)); - if (! ret) + help.UseConfig(wxConfig::Get()); + bool ret; + help.SetTempDir(wxT(".")); + ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX)); + if (! ret) wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp")); - ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX)); - if (! ret) + ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX)); + if (! ret) wxMessageBox(_("Failed adding book helpfiles/another.hhp")); - } +} // event handlers - void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) - { +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) +{ // true is to force the frame to close - Close(true); - } - - void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event)) - { - help.Display(wxT("Test HELPFILE")); - } - - void MyFrame::OnClose(wxCloseEvent& event) - { - // Close the help frame; this will cause the config data to - // get written. - if ( help.GetFrame() ) // returns NULL if no help frame active - help.GetFrame()->Close(true); - // now we can safely delete the config pointer - event.Skip(); - delete wxConfig::Set(NULL); - } - - - - + Close(true); +} + +void MyFrame::OnHelp(wxCommandEvent& WXUNUSED(event)) +{ + help.Display(wxT("Test HELPFILE")); +} + +void MyFrame::OnClose(wxCloseEvent& event) +{ + // Close the help frame; this will cause the config data to + // get written. + if ( help.GetFrame() ) // returns NULL if no help frame active + help.GetFrame()->Close(true); + // now we can safely delete the config pointer + event.Skip(); + delete wxConfig::Set(NULL); +} diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp index ba4c62925d..a0b28929ed 100644 --- a/samples/html/helpview/helpview.cpp +++ b/samples/html/helpview/helpview.cpp @@ -1,9 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpview.cpp -// Purpose: wxHtml help browser +// Name: printing.cpp +// Purpose: wxHtml sample: help browser +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + // Please note: see utils/helpview for a more fully-featured // standalone help browser. -///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -24,27 +31,27 @@ #include "wx/log.h" #include "wx/filedlg.h" + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- - // Define a new application type, each program should derive a class from wxApp class MyApp : public wxApp { - public: - // override base class virtuals - // ---------------------------- +public: + // override base class virtuals + // ---------------------------- - // this one is called on application startup and is a good place for the app - // initialization (doing it here and not in the ctor allows to have an error - // return: if OnInit() returns false, the application terminates) + // this one is called on application startup and is a good place for the app + // initialization (doing it here and not in the ctor allows to have an error + // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); - virtual int OnExit(); + virtual bool OnInit(); + virtual int OnExit(); - private: - wxHtmlHelpController *help; +private: + wxHtmlHelpController *help; }; @@ -61,7 +68,7 @@ bool MyApp::OnInit() wxFileSystem::AddHandler(new wxZipFSHandler); SetVendorName(wxT("wxWidgets")); - SetAppName(wxT("wxHTMLHelp")); + SetAppName(wxT("wxHTMLHelp")); wxConfig::Get(); // create an instance help = new wxHtmlHelpController; @@ -84,7 +91,6 @@ bool MyApp::OnInit() return true; } - int MyApp::OnExit() { delete help; diff --git a/samples/html/htmlctrl/htmlctrl.cpp b/samples/html/htmlctrl/htmlctrl.cpp index c003f9cb19..8c50bee322 100644 --- a/samples/html/htmlctrl/htmlctrl.cpp +++ b/samples/html/htmlctrl/htmlctrl.cpp @@ -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 diff --git a/samples/html/printing/printing.cpp b/samples/html/printing/printing.cpp index 036aa8912f..bfec54d97f 100644 --- a/samples/html/printing/printing.cpp +++ b/samples/html/printing/printing.cpp @@ -1,7 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: printimg.cpp -// Purpose: wxHtmlEasyPrinting testing example -// Licence: wxWindows Licence +// Name: printing.cpp +// Purpose: wxHtml sample: wxHtmlEasyPrinting test +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,6 +27,10 @@ #include "wx/html/htmlwin.h" #include "wx/html/htmprint.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // private classes @@ -30,46 +39,47 @@ // Define a new application type, each program should derive a class from wxApp class MyApp : public wxApp { - public: - // override base class virtuals - // ---------------------------- +public: + // override base class virtuals + // ---------------------------- - // this one is called on application startup and is a good place for the app - // initialization (doing it here and not in the ctor allows to have an error - // return: if OnInit() returns false, the application terminates) + // this one is called on application startup and is a good place for the app + // initialization (doing it here and not in the ctor allows to have an error + // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); + virtual bool OnInit(); }; // Define a new frame type: this is going to be our main frame class MyFrame : public wxFrame { - public: - // ctor and dtor - - MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); - virtual ~MyFrame(); - - // event handlers (these functions should _not_ be virtual) - void OnQuit(wxCommandEvent& event); - void OnAbout(wxCommandEvent& event); - - void OnPageSetup(wxCommandEvent& event); - void OnPrint(wxCommandEvent& event); - void OnPreview(wxCommandEvent& event); - void OnOpen(wxCommandEvent& event); - - void OnPrintSmall(wxCommandEvent& event); - void OnPrintNormal(wxCommandEvent& event); - void OnPrintHuge(wxCommandEvent& event); - - - private: - wxHtmlWindow *m_Html; - wxHtmlEasyPrinting *m_Prn; - wxString m_Name; - // any class wishing to process wxWidgets events must use this macro - DECLARE_EVENT_TABLE() +public: + // ctor and dtor + + MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); + virtual ~MyFrame(); + + // event handlers (these functions should _not_ be virtual) + void OnQuit(wxCommandEvent& event); + void OnAbout(wxCommandEvent& event); + + void OnPageSetup(wxCommandEvent& event); + void OnPrint(wxCommandEvent& event); + void OnPreview(wxCommandEvent& event); + void OnOpen(wxCommandEvent& event); + + void OnPrintSmall(wxCommandEvent& event); + void OnPrintNormal(wxCommandEvent& event); + void OnPrintHuge(wxCommandEvent& event); + + +private: + wxHtmlWindow *m_Html; + wxHtmlEasyPrinting *m_Prn; + wxString m_Name; + + // any class wishing to process wxWidgets events must use this macro + DECLARE_EVENT_TABLE() }; // ---------------------------------------------------------------------------- @@ -165,6 +175,8 @@ bool MyApp::OnInit() MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) { + SetIcon(wxICON(sample)); + // create a menu bar wxMenu *menuFile = new wxMenu; menuFile->Append(Minimal_Open, _("Open...\tCtrl-O")); @@ -181,7 +193,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) testFile->Append(Minimal_PrintSmall, _("Small Printer Fonts")); testFile->Append(Minimal_PrintNormal, _("Normal Printer Fonts")); testFile->Append(Minimal_PrintHuge, _("Huge Printer Fonts")); - + // now append the freshly created menu to the menu bar... wxMenuBar *menuBar = new wxMenuBar; menuBar->Append(menuFile, _("&File")); @@ -201,7 +213,7 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) #endif // wxUSE_STATUSBAR m_Name = wxT("test.htm"); m_Html -> LoadPage(m_Name); - + m_Prn = new wxHtmlEasyPrinting(_("Easy Printing Demo"), this); m_Prn -> SetHeader(m_Name + wxT("(@PAGENUM@/@PAGESCNT@)
"), wxPAGE_ALL); @@ -260,7 +272,7 @@ void MyFrame::OnOpen(wxCommandEvent& WXUNUSED(event)) m_Name = dialog.GetPath(); m_Html -> LoadPage(m_Name); m_Prn -> SetHeader(m_Name + wxT("(@PAGENUM@/@PAGESCNT@)
"), wxPAGE_ALL); - } + } } diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp index 27c1b8a57a..58310342a6 100644 --- a/samples/html/virtual/virtual.cpp +++ b/samples/html/virtual/virtual.cpp @@ -1,7 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: virtua;.cpp -// Purpose: wxHtml testing example -// demonstrates virtual file systems feature +// Name: virtual.cpp +// Purpose: wxHtml sample: demonstrates virtual file systems feature +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -17,9 +22,11 @@ #include "wx/wx.h" #endif - #include "wx/html/htmlwin.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif // new handler class: @@ -27,6 +34,9 @@ #include "wx/mstream.h" +// ---------------------------------------------------------------------------- +// MyVFS +// ---------------------------------------------------------------------------- class MyVFS : public wxFileSystemHandler { @@ -37,14 +47,11 @@ public: bool CanOpen(const wxString& location); }; - bool MyVFS::CanOpen(const wxString& location) { return (GetProtocol(location) == wxT("myVFS")); } - - wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { wxFSFile *f; @@ -53,13 +60,13 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) const wxWX2MBbuf loc = location.ToAscii(); sprintf(buf, "

You're in Node %s

" - "Where do you want to go?

" - "sub-1
" - "sub-2
" - "sub-3
" - "
", - (const char*)loc, (const char*)loc, (const char*)loc, - (const char*)loc); + "Where do you want to go?
" + "sub-1
" + "sub-2
" + "sub-3
" + "
", + (const char*)loc, (const char*)loc, (const char*)loc, + (const char*)loc); // NB: There's a terrible hack involved: we fill 'buf' with new data every // time this method is called and return new wxMemoryInputStream pointing to it. @@ -68,7 +75,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) // time. str = new wxMemoryInputStream(buf, strlen(buf)); f = new wxFSFile(str, location, wxT("text/html"), wxEmptyString, wxDateTime::Today()); - + return f; } @@ -79,50 +86,50 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) // ---------------------------------------------------------------------------- // Define a new application type, each program should derive a class from wxApp - class MyApp : public wxApp - { - public: +class MyApp : public wxApp +{ +public: // override base class virtuals // ---------------------------- - + // this one is called on application startup and is a good place for the app // initialization (doing it here and not in the ctor allows to have an error // return: if OnInit() returns false, the application terminates) - virtual bool OnInit(); - }; + virtual bool OnInit(); +}; // Define a new frame type: this is going to be our main frame - class MyFrame : public wxFrame - { - public: +class MyFrame : public wxFrame +{ +public: // ctor(s) - MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); - + MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size); + // event handlers (these functions should _not_ be virtual) - void OnQuit(wxCommandEvent& event); - void OnBack(wxCommandEvent& event); - void OnForward(wxCommandEvent& event); + void OnQuit(wxCommandEvent& event); + void OnBack(wxCommandEvent& event); + void OnForward(wxCommandEvent& event); - private: +private: // any class wishing to process wxWidgets events must use this macro DECLARE_EVENT_TABLE() - }; +}; // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- // IDs for the controls and the menu commands - enum - { - // menu items - Minimal_Quit = 1, - Minimal_Back, - Minimal_Forward, - - // controls start here (the numbers are, of course, arbitrary) - Minimal_Text = 1000 - }; +enum +{ + // menu items + Minimal_Quit = 1, + Minimal_Back, + Minimal_Forward, + + // controls start here (the numbers are, of course, arbitrary) + Minimal_Text = 1000 +}; // ---------------------------------------------------------------------------- // event tables and other macros for wxWidgets @@ -131,48 +138,48 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) // 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) - EVT_MENU(Minimal_Quit, MyFrame::OnQuit) - EVT_MENU(Minimal_Back, MyFrame::OnBack) - EVT_MENU(Minimal_Forward, MyFrame::OnForward) - END_EVENT_TABLE() - - // 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 declares the accessor function - // wxGetApp() which will return the reference of the right type (i.e. MyApp and - // not wxApp) - IMPLEMENT_APP(MyApp) - - // ============================================================================ - // implementation - // ============================================================================ - - // ---------------------------------------------------------------------------- - // the application class - // ---------------------------------------------------------------------------- - - // `Main program' equivalent: the program execution "starts" here - bool MyApp::OnInit() - { - if ( !wxApp::OnInit() ) - return false; +BEGIN_EVENT_TABLE(MyFrame, wxFrame) + EVT_MENU(Minimal_Quit, MyFrame::OnQuit) + EVT_MENU(Minimal_Back, MyFrame::OnBack) + EVT_MENU(Minimal_Forward, MyFrame::OnForward) +END_EVENT_TABLE() + +// 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 declares the accessor function +// wxGetApp() which will return the reference of the right type (i.e. MyApp and +// not wxApp) +IMPLEMENT_APP(MyApp) + +// ============================================================================ +// implementation +// ============================================================================ + +// ---------------------------------------------------------------------------- +// the application class +// ---------------------------------------------------------------------------- + +// `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(_("wxHtmlWindow testing application"), - wxDefaultPosition, wxSize(640, 480)); + MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"), + 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? - frame->Show(true); - SetTopWindow(frame); - wxFileSystem::AddHandler(new MyVFS); + frame->Show(true); + SetTopWindow(frame); + wxFileSystem::AddHandler(new MyVFS); // success: wxApp::OnRun() will be called which will enter the main message // loop and the application will run. If we returned false here, the // application would exit immediately. - return true; - } + return true; +} // ---------------------------------------------------------------------------- // main frame @@ -181,53 +188,54 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) wxHtmlWindow *html; // frame constructor - MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) - : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) - { +MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size) + : wxFrame((wxFrame *)NULL, wxID_ANY, title, pos, size) +{ + SetIcon(wxICON(sample)); + // create a menu bar - wxMenu *menuFile = new wxMenu; - wxMenu *menuNav = new wxMenu; + wxMenu *menuFile = new wxMenu; + wxMenu *menuNav = new wxMenu; - menuFile->Append(Minimal_Quit, _("E&xit")); - menuNav->Append(Minimal_Back, _("Go &BACK")); - menuNav->Append(Minimal_Forward, _("Go &FORWARD")); + menuFile->Append(Minimal_Quit, _("E&xit")); + menuNav->Append(Minimal_Back, _("Go &BACK")); + menuNav->Append(Minimal_Forward, _("Go &FORWARD")); // now append the freshly created menu to the menu bar... - wxMenuBar *menuBar = new wxMenuBar; - menuBar->Append(menuFile, _("&File")); - menuBar->Append(menuNav, _("&Navigate")); + wxMenuBar *menuBar = new wxMenuBar; + menuBar->Append(menuFile, _("&File")); + menuBar->Append(menuNav, _("&Navigate")); // ... and attach this menu bar to the frame - SetMenuBar(menuBar); - + SetMenuBar(menuBar); + #if wxUSE_STATUSBAR - CreateStatusBar(2); + CreateStatusBar(2); #endif // wxUSE_STATUSBAR - html = new wxHtmlWindow(this); - html -> SetRelatedFrame(this, _("VFS Demo: '%s'")); + html = new wxHtmlWindow(this); + html -> SetRelatedFrame(this, _("VFS Demo: '%s'")); #if wxUSE_STATUSBAR - html -> SetRelatedStatusBar(1); + html -> SetRelatedStatusBar(1); #endif // wxUSE_STATUSBAR - html -> LoadPage(wxT("start.htm")); - } + html -> LoadPage(wxT("start.htm")); +} // event handlers - void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) - { +void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) +{ // true is to force the frame to close - Close(true); - } - - void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) - { - if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!")); - } + Close(true); +} +void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event)) +{ + if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!")); +} - void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) - { - if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!")); - } +void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event)) +{ + if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!")); +} diff --git a/samples/html/widget/widget.cpp b/samples/html/widget/widget.cpp index 2d5f6fca74..c1449ce772 100644 --- a/samples/html/widget/widget.cpp +++ b/samples/html/widget/widget.cpp @@ -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 diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp index 60ec2e3e9f..6363dfab85 100644 --- a/samples/html/zip/zip.cpp +++ b/samples/html/zip/zip.cpp @@ -1,6 +1,12 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: test.cpp -// Purpose: wxHtml testing example +// Name: zip.cpp +// Purpose: wxHtml sample +// Author: ? +// Modified by: +// Created: ? +// RCS-ID: $Id$ +// Copyright: (c) wxWidgets team +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". @@ -20,6 +26,10 @@ #include "wx/html/htmlwin.h" #include "wx/fs_zip.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -133,8 +143,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; diff --git a/samples/mobile/styles/styles.cpp b/samples/mobile/styles/styles.cpp index 7038275a9c..8042e2d636 100644 --- a/samples/mobile/styles/styles.cpp +++ b/samples/mobile/styles/styles.cpp @@ -17,6 +17,10 @@ // Include private headers #include "styles.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif + //------------------------------------------------------------------------------ // MyFrame //------------------------------------------------------------------------------ @@ -31,6 +35,8 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style ) : wxFrame( parent, id, title, position, size, style ) { + SetIcon(wxICON(sample)); + // Create menu and status bar. CreateMyMenuBar(); #if wxUSE_STATUSBAR diff --git a/samples/mobile/wxedit/wxedit.cpp b/samples/mobile/wxedit/wxedit.cpp index b6043f9e66..e9648f548f 100644 --- a/samples/mobile/wxedit/wxedit.cpp +++ b/samples/mobile/wxedit/wxedit.cpp @@ -18,6 +18,10 @@ // Include private headers #include "wxedit.h" +#ifndef __WXMSW__ + #include "../../sample.xpm" +#endif + //------------------------------------------------------------------------------ // constants //------------------------------------------------------------------------------ @@ -52,6 +56,8 @@ MyFrame::MyFrame( wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &position, const wxSize& size, long style ) : wxFrame( parent, id, title, position, size, style ) { + SetIcon(wxICON(sample)); + // Create menu and status bar. CreateMyMenuBar(); #if wxUSE_STATUSBAR -- 2.47.2