]> git.saurik.com Git - wxWidgets.git/commitdiff
initialize wxZipFSHandler even when wxUSE_GIF=0
authorVadim Zeitlin <vadim@wxwidgets.org>
Mon, 20 Mar 2006 17:09:03 +0000 (17:09 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Mon, 20 Mar 2006 17:09:03 +0000 (17:09 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

samples/help/demo.cpp

index da378e40931ad955d45676aa7de9662792ba65a7..e36ac139d9402af9fbc71d806559fa6f0596f009 100644 (file)
@@ -287,17 +287,16 @@ bool MyApp::OnInit()
     wxHelpProvider::Set(provider);
 
 #if wxUSE_HTML
-#if wxUSE_GIF
-    // Required for images in the online documentation
-    wxImage::AddHandler(new wxGIFHandler);
+    #if wxUSE_GIF
+        // Required for images in the online documentation
+        wxImage::AddHandler(new wxGIFHandler);
+    #endif // wxUSE_GIF
 
     // Required for advanced HTML help
-#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
-      wxFileSystem::AddHandler(new wxZipFSHandler);
-#endif
-
-#endif
-#endif
+    #if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
+        wxFileSystem::AddHandler(new wxZipFSHandler);
+    #endif
+#endif // wxUSE_HTML
 
     // Create the main application window
     MyFrame *frame = new MyFrame(_T("HelpDemo wxWidgets App"),
@@ -309,7 +308,7 @@ bool MyApp::OnInit()
 #else
     provider->SetHelpController(& frame->GetHelpController());
 #endif
-#endif
+#endif // !USE_SIMPLE_HELP_PROVIDER
 
     frame->Show(true);
     SetTopWindow(frame);