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

@@ -1,6 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
+// Name:        about.cpp
-// Purpose:     wxHtml testing example
+// 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;
 

samples/html/help/help.cpp

@@ -1,6 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
+// Name:        help.cpp
-// Purpose:     wxHtml testing example
+// 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
+class MyApp : public wxApp
-   {
+{
-   public:
+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
+class MyFrame : public wxFrame
-   {
+{
-   public:
+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 OnQuit(wxCommandEvent& event);
-      void OnHelp(wxCommandEvent& event);
+    void OnHelp(wxCommandEvent& event);
-      void OnClose(wxCloseEvent& event);
+    void OnClose(wxCloseEvent& event);
-   private:
+private:
-      wxHtmlHelpController help;
+    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_Quit = 1,
-   Minimal_Help
+    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)
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
-   EVT_MENU(Minimal_Help, MyFrame::OnHelp)
+    EVT_MENU(Minimal_Help, MyFrame::OnHelp)
-   EVT_CLOSE(MyFrame::OnClose)
+    EVT_CLOSE(MyFrame::OnClose)
-   END_EVENT_TABLE()
+END_EVENT_TABLE()
 
-   // Create a new application object: this macro will allow wxWidgets to create
+// Create a new application object: this macro will allow wxWidgets to create
-   // the application object during program execution (it's better than using a
+// the application object during program execution (it's better than using a
-   // static object for many reasons) and also declares the accessor function
+// 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
+// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-   // not wxApp)
+// not wxApp)
-   IMPLEMENT_APP(MyApp)
+IMPLEMENT_APP(MyApp)
 
-   // ============================================================================
+// ============================================================================
-   // implementation
+// implementation
-   // ============================================================================
+// ============================================================================
 
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   // the application class
+// the application class
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   // `Main program' equivalent: the program execution "starts" here
+// `Main program' equivalent: the program execution "starts" here
-   bool MyApp::OnInit()
+bool MyApp::OnInit()
-   {
+{
-       if ( !wxApp::OnInit() )
+    if ( !wxApp::OnInit() )
-           return false;
+        return false;
 
-      wxInitAllImageHandlers();
+    wxInitAllImageHandlers();
 #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
-      wxFileSystem::AddHandler(new wxZipFSHandler);
+    wxFileSystem::AddHandler(new wxZipFSHandler);
 #endif
-      SetVendorName(wxT("wxWidgets"));
+    SetVendorName(wxT("wxWidgets"));
-      SetAppName(wxT("wxHTMLHelp"));
+    SetAppName(wxT("wxHTMLHelp"));
 
     // Create the main application window
-      MyFrame *frame = new MyFrame(_("HTML Help Sample"),
+    MyFrame *frame = new MyFrame(_("HTML Help Sample"),
-         wxDefaultPosition, wxDefaultSize);
+        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);
+    frame->Show(true);
-      SetTopWindow(frame);
+    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)
+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),
-     help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
+                help(wxHF_DEFAULT_STYLE | wxHF_OPEN_FILES)
-   {
+{
-    // create a menu bar
+    SetIcon(wxICON(sample));
-      wxMenu *menuFile = new wxMenu;
 
-      menuFile->Append(Minimal_Help, _("&Help"));
+    // create a menu bar
-      menuFile->Append(Minimal_Quit, _("E&xit"));
+    wxMenu *menuFile = new wxMenu;
+
+    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;
+    wxMenuBar *menuBar = new wxMenuBar;
-      menuBar->Append(menuFile, _("&File"));
+    menuBar->Append(menuFile, _("&File"));
 
     // ... and attach this menu bar to the frame
-      SetMenuBar(menuBar);
+    SetMenuBar(menuBar);
 
-      help.UseConfig(wxConfig::Get());
+    help.UseConfig(wxConfig::Get());
-      bool ret;
+    bool ret;
-      help.SetTempDir(wxT("."));
+    help.SetTempDir(wxT("."));
-      ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));
+    ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));
-      if (! ret)
+    if (! ret)
         wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
-      ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
+    ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));
-      if (! ret)
+    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);
+    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);
-   }
-
-
 
+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);
+}
 
 
 

samples/html/helpview/helpview.cpp

@@ -1,9 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpview.cpp
+// Name:        printing.cpp
-// Purpose:     wxHtml help browser
+// 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:
+public:
-        // override base class virtuals
+    // override base class virtuals
-        // ----------------------------
+    // ----------------------------
 
-        // this one is called on application startup and is a good place for the app
+    // 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
+    // initialization (doing it here and not in the ctor allows to have an error
-        // return: if OnInit() returns false, the application terminates)
+    // return: if OnInit() returns false, the application terminates)
 
-        virtual bool OnInit();
+    virtual bool OnInit();
-        virtual int OnExit();
+    virtual int OnExit();
 
-    private:
+private:
-        wxHtmlHelpController *help;
+    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;

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

samples/html/printing/printing.cpp

@@ -1,7 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        printimg.cpp
+// Name:        printing.cpp
-// Purpose:     wxHtmlEasyPrinting testing example
+// Purpose:     wxHtml sample: wxHtmlEasyPrinting test
-// Licence:     wxWindows Licence
+// 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:
+public:
-        // override base class virtuals
+    // override base class virtuals
-        // ----------------------------
+    // ----------------------------
 
-        // this one is called on application startup and is a good place for the app
+    // 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
+    // initialization (doing it here and not in the ctor allows to have an error
-        // return: if OnInit() returns false, the application terminates)
+    // 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:
+public:
-        // ctor and dtor
+    // ctor and dtor
 
-        MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
+    MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
-        virtual ~MyFrame();
+    virtual ~MyFrame();
 
-        // event handlers (these functions should _not_ be virtual)
+    // event handlers (these functions should _not_ be virtual)
-        void OnQuit(wxCommandEvent& event);
+    void OnQuit(wxCommandEvent& event);
-        void OnAbout(wxCommandEvent& event);
+    void OnAbout(wxCommandEvent& event);
 
-        void OnPageSetup(wxCommandEvent& event);
+    void OnPageSetup(wxCommandEvent& event);
-        void OnPrint(wxCommandEvent& event);
+    void OnPrint(wxCommandEvent& event);
-        void OnPreview(wxCommandEvent& event);
+    void OnPreview(wxCommandEvent& event);
-        void OnOpen(wxCommandEvent& event);
+    void OnOpen(wxCommandEvent& event);
-        
+
-        void OnPrintSmall(wxCommandEvent& event);
+    void OnPrintSmall(wxCommandEvent& event);
-        void OnPrintNormal(wxCommandEvent& event);
+    void OnPrintNormal(wxCommandEvent& event);
-        void OnPrintHuge(wxCommandEvent& event);
+    void OnPrintHuge(wxCommandEvent& event);
 
 
-    private:
+private:
-        wxHtmlWindow *m_Html;
+    wxHtmlWindow *m_Html;
-        wxHtmlEasyPrinting *m_Prn;
+    wxHtmlEasyPrinting *m_Prn;
-        wxString m_Name;
+    wxString m_Name;
-        // any class wishing to process wxWidgets events must use this macro
+
-        DECLARE_EVENT_TABLE()
+    // 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@)<hr>"), 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@)<hr>"), wxPAGE_ALL);
-    } 
+    }
 }
 
 

samples/html/virtual/virtual.cpp

@@ -1,7 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        virtua;.cpp
+// Name:        virtual.cpp
-// Purpose:     wxHtml testing example
+// Purpose:     wxHtml sample: demonstrates virtual file systems feature
-//              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, "<html><body><h2><i>You're in Node <u>%s</u></i></h2><p>"
-                 "Where do you want to go?<br><blockquote>"
+                "Where do you want to go?<br><blockquote>"
-                 "<a href=\"%s-1\">sub-1</a><br>"
+                "<a href=\"%s-1\">sub-1</a><br>"
-                 "<a href=\"%s-2\">sub-2</a><br>"
+                "<a href=\"%s-2\">sub-2</a><br>"
-                 "<a href=\"%s-3\">sub-3</a><br>"
+                "<a href=\"%s-3\">sub-3</a><br>"
-                 "</blockquote></body></html>",
+                "</blockquote></body></html>",
-                 (const char*)loc, (const char*)loc, (const char*)loc, 
+                (const char*)loc, (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
+class MyApp : public wxApp
-   {
+{
-   public:
+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
+class MyFrame : public wxFrame
-   {
+{
-   public:
+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);
 
-   private:
+    // event handlers (these functions should _not_ be virtual)
+    void OnQuit(wxCommandEvent& event);
+    void OnBack(wxCommandEvent& event);
+    void OnForward(wxCommandEvent& event);
+
+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
+enum
-   {
+{
-    // menu items
+        // menu items
-   Minimal_Quit = 1,
+    Minimal_Quit = 1,
-   Minimal_Back,
+    Minimal_Back,
-   Minimal_Forward,
+    Minimal_Forward,
-   
+
-    // controls start here (the numbers are, of course, arbitrary)
+        // controls start here (the numbers are, of course, arbitrary)
-   Minimal_Text = 1000
+    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)
+BEGIN_EVENT_TABLE(MyFrame, wxFrame)
-   EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
+    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
-   EVT_MENU(Minimal_Back, MyFrame::OnBack)
+    EVT_MENU(Minimal_Back, MyFrame::OnBack)
-   EVT_MENU(Minimal_Forward, MyFrame::OnForward)
+    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
-   END_EVENT_TABLE()
+END_EVENT_TABLE()
-   
+
-   // Create a new application object: this macro will allow wxWidgets to create
+// Create a new application object: this macro will allow wxWidgets to create
-   // the application object during program execution (it's better than using a
+// the application object during program execution (it's better than using a
-   // static object for many reasons) and also declares the accessor function
+// 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
+// wxGetApp() which will return the reference of the right type (i.e. MyApp and
-   // not wxApp)
+// not wxApp)
-   IMPLEMENT_APP(MyApp)
+IMPLEMENT_APP(MyApp)
-   
+
-   // ============================================================================
+// ============================================================================
-   // implementation
+// implementation
-   // ============================================================================
+// ============================================================================
-   
+
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   // the application class
+// the application class
-   // ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
-   
+
-   // `Main program' equivalent: the program execution "starts" here
+// `Main program' equivalent: the program execution "starts" here
-   bool MyApp::OnInit()
+bool MyApp::OnInit()
-   {
+{
-     if ( !wxApp::OnInit() )
+    if ( !wxApp::OnInit() )
-         return false;
+        return false;
 
     // Create the main application window
-      MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
+    MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
-         wxDefaultPosition, 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?
-      frame->Show(true);
+    frame->Show(true);
-      SetTopWindow(frame);
+    SetTopWindow(frame);
-      wxFileSystem::AddHandler(new MyVFS);
+    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)
+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)
-   {
+{
-    // create a menu bar
+    SetIcon(wxICON(sample));
-      wxMenu *menuFile = new wxMenu;
-      wxMenu *menuNav = new wxMenu;
 
-      menuFile->Append(Minimal_Quit, _("E&xit"));
+    // create a menu bar
-      menuNav->Append(Minimal_Back, _("Go &BACK"));
+    wxMenu *menuFile = new wxMenu;
-      menuNav->Append(Minimal_Forward, _("Go &FORWARD"));
+    wxMenu *menuNav = new wxMenu;
+
+    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;
+    wxMenuBar *menuBar = new wxMenuBar;
-      menuBar->Append(menuFile, _("&File"));
+    menuBar->Append(menuFile, _("&File"));
-      menuBar->Append(menuNav, _("&Navigate"));
+    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 = new wxHtmlWindow(this);
-      html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
+    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);
+    Close(true);
-   }
+}
 
-   void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
+void MyFrame::OnBack(wxCommandEvent& WXUNUSED(event))
-   {
+{
-   if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
+    if (!html -> HistoryBack()) wxMessageBox(_("You reached prehistory era!"));
-   }
+}
 
-
+void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
-   void MyFrame::OnForward(wxCommandEvent& WXUNUSED(event))
+{
-   {
+    if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
-   if (!html -> HistoryForward()) wxMessageBox(_("No more items in history!"));
+}
-   }

samples/html/widget/widget.cpp

@@ -1,7 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        widget.cpp
+// Name:        zip.cpp
-// Purpose:     wxHtml testing example
+// Purpose:     wxHtml sample: Demonstrates embedded controls
-//              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

samples/html/zip/zip.cpp

@@ -1,6 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        test.cpp
+// Name:        zip.cpp
-// Purpose:     wxHtml testing example
+// 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;

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

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