initialize wxZipFSHandler even when wxUSE_GIF=0
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
45778c96d4
commit
a6c355d270
@ -287,17 +287,16 @@ bool MyApp::OnInit()
|
|||||||
wxHelpProvider::Set(provider);
|
wxHelpProvider::Set(provider);
|
||||||
|
|
||||||
#if wxUSE_HTML
|
#if wxUSE_HTML
|
||||||
#if wxUSE_GIF
|
#if wxUSE_GIF
|
||||||
// Required for images in the online documentation
|
// Required for images in the online documentation
|
||||||
wxImage::AddHandler(new wxGIFHandler);
|
wxImage::AddHandler(new wxGIFHandler);
|
||||||
|
#endif // wxUSE_GIF
|
||||||
|
|
||||||
// Required for advanced HTML help
|
// Required for advanced HTML help
|
||||||
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
|
#if wxUSE_STREAMS && wxUSE_ZIPSTREAM && wxUSE_ZLIB
|
||||||
wxFileSystem::AddHandler(new wxZipFSHandler);
|
wxFileSystem::AddHandler(new wxZipFSHandler);
|
||||||
#endif
|
#endif
|
||||||
|
#endif // wxUSE_HTML
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Create the main application window
|
// Create the main application window
|
||||||
MyFrame *frame = new MyFrame(_T("HelpDemo wxWidgets App"),
|
MyFrame *frame = new MyFrame(_T("HelpDemo wxWidgets App"),
|
||||||
@ -309,7 +308,7 @@ bool MyApp::OnInit()
|
|||||||
#else
|
#else
|
||||||
provider->SetHelpController(& frame->GetHelpController());
|
provider->SetHelpController(& frame->GetHelpController());
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif // !USE_SIMPLE_HELP_PROVIDER
|
||||||
|
|
||||||
frame->Show(true);
|
frame->Show(true);
|
||||||
SetTopWindow(frame);
|
SetTopWindow(frame);
|
||||||
|
Loading…
Reference in New Issue
Block a user