Don't use GetThreadId() in wxMSW code.

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

diff --git a/samples/html/zip/zip.cpp b/samples/html/zip/zip.cpp
index 6363dfab85f1ce63d5a6b8426fdb3e470f0598bd..37c5f2377edf9740aaefe9052f910558f6dde955 100644 (file)
--- a/samples/html/zip/zip.cpp
+++ b/samples/html/zip/zip.cpp
@@ -26,7 +26,7 @@
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 
 #include "wx/html/htmlwin.h"
 #include "wx/fs_zip.h"
 

-#ifndef __WXMSW__
+#ifndef wxHAS_IMAGES_IN_RESOURCES

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


@@ -123,10 +123,8 @@ bool MyApp::OnInit()
     MyFrame *frame = new MyFrame(_("wxHtmlWindow testing application"),
         wxDefaultPosition, wxSize(640, 480) );
 
     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);
     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