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 664b18f06efd17b9a1c677dfcb14b5046908e979..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


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

+        wxBoxSizer *topsizer;

         wxHtmlWindow *html;
         wxHtmlWindow *html;

-#ifdef __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"));
+
+        topsizer = new wxBoxSizer(wxVERTICAL);

 
 

-        html = new wxHtmlWindow(&dlg, -1, wxPoint(10, 10), wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
+        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));
+        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();
         bu1 -> SetDefault();

+
+        topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
+
+        dlg.SetAutoLayout(TRUE);
+        dlg.SetSizer(topsizer);
+        topsizer -> Fit(&dlg);
+

         dlg.ShowModal();
     }
 
         dlg.ShowModal();
     }