Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index c1c2954466af4cc15d4ab5ff29fef11fb399e610..20351cac6372c00f0568cc3088a72e9ce158a6d5 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -28,7 +28,7 @@
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"
 
 #include "wx/filesys.h"
 #include "wx/fs_zip.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

     #include "../../sample.xpm"
 #endif
 
     #include "../../sample.xpm"
 #endif
 


@@ -127,11 +127,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("HTML Help Sample"),
         wxDefaultPosition, wxDefaultSize);
 
     MyFrame *frame = new MyFrame(_("HTML Help Sample"),
         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

     frame->Show(true);
     frame->Show(true);

-    SetTopWindow(frame);
-

 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the
 
     // success: wxApp::OnRun() will be called which will enter the main message
     // loop and the application will run. If we returned false here, the