Fix compilation error

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

diff --git a/samples/html/about/about.cpp b/samples/html/about/about.cpp
index e5e0c7645c857aadd9de8e711ba5d679a9631548..0cea47afd6632343c95d6ef80fa69e4ed334335c 100644 (file)
--- a/samples/html/about/about.cpp
+++ b/samples/html/about/about.cpp
@@ -3,11 +3,6 @@
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 
 // Purpose:     wxHtml testing example
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation "test.cpp"
-    #pragma interface "test.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -16,7 +11,7 @@
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 #endif
 
 // for all others, include the necessary headers (this file is usually all you

-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers

 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif
 #ifndef WX_PRECOMP
     #include "wx/wx.h"
 #endif


@@ -56,7 +51,7 @@
       void OnAbout(wxCommandEvent& event);
 
    private:
       void OnAbout(wxCommandEvent& event);
 
    private:

-    // any class wishing to process wxWindows events must use this macro
+    // any class wishing to process wxWidgets events must use this macro

     DECLARE_EVENT_TABLE()
    };
 
     DECLARE_EVENT_TABLE()
    };
 


@@ -78,10 +73,10 @@
    };
 
 // ----------------------------------------------------------------------------
    };
 
 // ----------------------------------------------------------------------------

-// event tables and other macros for wxWindows
+// event tables and other macros for wxWidgets

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// the event tables connect the wxWindows events with the functions (event
+// 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)
 // 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)


@@ -89,7 +84,7 @@
    EVT_MENU(Minimal_About, MyFrame::OnAbout)
    END_EVENT_TABLE()
 
    EVT_MENU(Minimal_About, MyFrame::OnAbout)
    END_EVENT_TABLE()
 

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


@@ -109,7 +104,7 @@
     wxImage::AddHandler(new wxPNGHandler);
     // Create the main application window
       MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
     wxImage::AddHandler(new wxPNGHandler);
     // Create the main application window
       MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),

-         wxPoint(50, 50), wxSize(150, 50));
+         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?
 
     // Show it and tell the application that it's our main window
     // @@@ what does it do exactly, in fact? is it necessary here?


@@ -166,19 +161,20 @@
         html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
         html -> SetBorders(0);
         html -> LoadPage(wxT("data/about.htm"));
         html = new wxHtmlWindow(&dlg, wxID_ANY, wxDefaultPosition, wxSize(380, 160), wxHW_SCROLLBAR_NEVER);
         html -> SetBorders(0);
         html -> LoadPage(wxT("data/about.htm"));

-        html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(), 
+        html -> SetSize(html -> GetInternalRepresentation() -> GetWidth(),

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

+#if wxUSE_STATLINE

         topsizer -> Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);
         topsizer -> Add(new wxStaticLine(&dlg, wxID_ANY), 0, wxEXPAND | wxLEFT | wxRIGHT, 10);

-                        
+#endif // wxUSE_STATLINE
+

         wxButton *bu1 = new wxButton(&dlg, wxID_OK, _("OK"));
         bu1 -> SetDefault();
 
         topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
 
         wxButton *bu1 = new wxButton(&dlg, wxID_OK, _("OK"));
         bu1 -> SetDefault();
 
         topsizer -> Add(bu1, 0, wxALL | wxALIGN_RIGHT, 15);
 

-        dlg.SetAutoLayout(true);

         dlg.SetSizer(topsizer);
         topsizer -> Fit(&dlg);
 
         dlg.SetSizer(topsizer);
         topsizer -> Fit(&dlg);