Removed an extra scope resolution operator in the declaration of class LifeShape

[wxWidgets.git] / samples / html / about / about.cpp

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index 3e3ffdebcb3aac6ade36d117a9c4f0b8e8463d61..f4c03cfeb67d5104afc79a01a614da8b34f27d00 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -22,7 +22,9 @@
 #endif
 
 #include <wx/image.h>
 #endif
 
 #include <wx/image.h>

+#include <wx/imagpng.h>

 #include <wx/wxhtml.h>
 #include <wx/wxhtml.h>

+#include <wx/statline.h>

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -35,7 +37,7 @@
    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)


@@ -48,7 +50,7 @@
    public:
     // ctor(s)
       MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);
    public:
     // ctor(s)
       MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size);

-   
+

     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnAbout(wxCommandEvent& event);
     // event handlers (these functions should _not_ be virtual)
       void OnQuit(wxCommandEvent& event);
       void OnAbout(wxCommandEvent& event);


@@ -70,7 +72,7 @@
    Minimal_About,
    Minimal_Back,
    Minimal_Forward,
    Minimal_About,
    Minimal_Back,
    Minimal_Forward,

-   
+

     // controls start here (the numbers are, of course, arbitrary)
    Minimal_Text = 1000,
    };
     // controls start here (the numbers are, of course, arbitrary)
    Minimal_Text = 1000,
    };


@@ -86,18 +88,18 @@
    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
    EVT_MENU(Minimal_About, MyFrame::OnAbout)
    END_EVENT_TABLE()
    EVT_MENU(Minimal_Quit,  MyFrame::OnQuit)
    EVT_MENU(Minimal_About, MyFrame::OnAbout)
    END_EVENT_TABLE()

-   
+

    // Create a new application object: this macro will allow wxWindows 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)
    // Create a new application object: this macro will allow wxWindows 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
    // ============================================================================
    // ============================================================================
    // implementation
    // ============================================================================

-   
+

    // ----------------------------------------------------------------------------
    // the application class
    // ----------------------------------------------------------------------------
    // ----------------------------------------------------------------------------
    // the application class
    // ----------------------------------------------------------------------------


@@ -108,7 +110,7 @@
     // Create the main application window
       MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
          wxPoint(50, 50), wxSize(150, 50));
     // Create the main application window
       MyFrame *frame = new MyFrame("wxHtmlWindow testing application",
          wxPoint(50, 50), wxSize(150, 50));

-   
+

     // 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);
     // 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);


@@ -155,24 +157,31 @@
 
    void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    {
 
    void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    {

+        wxBoxSizer *topsizer;

         wxHtmlWindow *html;
         wxHtmlWindow *html;

-#if __WXMSW__
-        wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 250), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
-#else
-        wxDialog dlg(this, -1, "About", wxDefaultPosition, wxSize(400, 230), wxDIALOG_MODAL | wxDEFAULT_DIALOG_STYLE);
-#endif
+        wxDialog dlg(this, -1, wxString("About"));

 
 

-        html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160), "htmlWindow", FALSE);
+        topsizer = new wxBoxSizer(wxVERTICAL);
+
+        html = new wxHtmlWindow(&dlg, -1, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);

         html -> SetBorders(0);
         html -> LoadPage("data/about.htm");
         html -> SetBorders(0);
         html -> LoadPage("data/about.htm");

-        wxButton *bu1 = new wxButton(&dlg, wxID_OK, "OK", wxPoint(250, 185), wxSize(100, 30));
-        bu1 -> SetDefault();
-        dlg.ShowModal();
-    }
-
+        html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(), 
+                        html -> GetInternalRepresentation() -> GetHeight());

 
 

+        topsizer -> Add(html, 1, wxALL, 10);

 
 

+        topsizer -> Add(new wxStaticLine(&dlg, -1), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
+                        
+        wxButton *bu1 = new wxButton(&dlg, wxID_OK, "Okay");
+        bu1 -> SetDefault();

 
 

+        topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);

 
 

+        dlg.SetAutoLayout(TRUE);
+        dlg.SetSizer(topsizer);
+        topsizer -> Fit(&dlg);

 
 

+        dlg.ShowModal();
+    }