Make a couple virtuals protected so they can be overridden.

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

diff --git a/samples/html/virtual/virtual.cpp b/samples/html/virtual/virtual.cpp
index 58310342a60a7751a734a846e75599074e9956a5..58086a31d6566c3df05bc80f42454d204addcd29 100644 (file)
--- a/samples/html/virtual/virtual.cpp
+++ b/samples/html/virtual/virtual.cpp
@@ -24,7 +24,7 @@
 
 #include "wx/html/htmlwin.h"
 
-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES
     #include "../../sample.xpm"
 #endif
 
@@ -169,10 +169,9 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         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
     frame->Show(true);
-    SetTopWindow(frame);
+
     wxFileSystem::AddHandler(new MyVFS);
 
     // success: wxApp::OnRun() will be called which will enter the main message