[ 1493802 ] Allow multiple wxComboCtrl::SetPopupControl calls.

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

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 7ac3a57d5f9b178e0398564d1251f01cd6e63bea..5e1f9da2c7a67b20acfd2428778a3ba88c8cdd61 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -4,11 +4,6 @@
 //              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"
 
@@ -162,7 +157,7 @@ wxFSFile* MyVFS::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
    {
     // 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?
@@ -202,11 +197,15 @@ wxHtmlWindow *html;
     // ... and attach this menu bar to the frame
       SetMenuBar(menuBar);
    
+#if wxUSE_STATUSBAR
       CreateStatusBar(2);
+#endif // wxUSE_STATUSBAR
 
       html = new wxHtmlWindow(this);
       html -> SetRelatedFrame(this, _("VFS Demo: '%s'"));
+#if wxUSE_STATUSBAR
       html -> SetRelatedStatusBar(1);
+#endif // wxUSE_STATUSBAR
       html -> LoadPage(wxT("start.htm"));
    }