Added wxFontEnumerator class for wxMSW, and fixed text validator for French

[wxWidgets.git] / src / html / htmlhelp_io.cpp

diff --git a/src/html/htmlhelp_io.cpp b/src/html/htmlhelp_io.cpp
index 78353f4725486a91dd586bd969027291823651da..89f9fb11945ff5ae5fd1fb24068422ffa11d440f 100644 (file)
--- a/src/html/htmlhelp_io.cpp
+++ b/src/html/htmlhelp_io.cpp
@@ -127,7 +127,9 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
     HP_TagHandler *handler = new HP_TagHandler(book);
     parser.AddTagHandler(handler);
 
     HP_TagHandler *handler = new HP_TagHandler(book);
     parser.AddTagHandler(handler);
 

-    f = fsys.OpenFile(contentsfile);
+    // Don't panic if no index or contensfile is supplied.
+    // (without contents is a bit useless, but leaving out the index is sometimes handy)
+    f = ( contentsfile.IsEmpty() ? NULL : fsys.OpenFile(contentsfile) );

     if (f) {
         sz = f -> GetStream() -> GetSize();
         buf = new char[sz+1];
     if (f) {
         sz = f -> GetStream() -> GetSize();
         buf = new char[sz+1];


@@ -140,7 +142,7 @@ void wxHtmlHelpController::LoadMSProject(HtmlBookRecord *book, wxFileSystem& fsy
         delete[] buf;
     }
 
         delete[] buf;
     }
 

-    f = fsys.OpenFile(indexfile);
+    f = ( indexfile.IsEmpty() ? NULL : fsys.OpenFile(indexfile) );

     if (f) {
         sz = f -> GetStream() -> GetSize();
         buf = new  char[sz+1];
     if (f) {
         sz = f -> GetStream() -> GetSize();
         buf = new  char[sz+1];


@@ -247,4 +249,4 @@ void wxHtmlHelpController::SaveCachedBook(HtmlBookRecord *book, wxOutputStream *
     }
 }
 
     }
 }
 

-#endif
\ No newline at end of file
+#endif