updated bakefiles to take advantage of Bakefile 0.2.3 (now required)

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

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index c4d21b943185024bc7d70ef65be0fa0a951ee752..27c1b8a57a8b52fc5a2fd8633fec0c794a22b26b 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -4,11 +4,6 @@
 //              demonstrates virtual file systems feature
 /////////////////////////////////////////////////////////////////////////////
 
 //              demonstrates virtual file systems feature
 /////////////////////////////////////////////////////////////////////////////
 

-#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"
 


@@ -17,7 +12,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


@@ -109,7 +104,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
       void OnForward(wxCommandEvent& event);
 
    private:
       void OnForward(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()
    };
 


@@ -126,14 +121,14 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    Minimal_Forward,
    
     // controls start here (the numbers are, of course, arbitrary)
    Minimal_Forward,
    
     // controls start here (the numbers are, of course, arbitrary)

-   Minimal_Text = 1000,
+   Minimal_Text = 1000

    };
 
 // ----------------------------------------------------------------------------
    };
 
 // ----------------------------------------------------------------------------

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


@@ -142,7 +137,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    END_EVENT_TABLE()
    
    EVT_MENU(Minimal_Forward, MyFrame::OnForward)
    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


@@ -160,9 +155,12 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    // `Main program' equivalent: the program execution "starts" here
    bool MyApp::OnInit()
    {
    // `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"),
     // Create the main application window
       MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),

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


@@ -202,11 +200,15 @@ wxHtmlWindow *html;
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    
     // ... and attach this menu bar to the frame
       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"));
    }