use AddBook(wxFileName)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp
index 783cda08fdb517916f06d653ab50a3844932a3df..0e6ed46d888ebd9bd63c200f70da6e094dacb7ad 100644 (file)
--- a/samples/html/help/help.cpp
+++ b/samples/html/help/help.cpp
@@ -155,19 +155,11 @@
 
       help.UseConfig(wxConfig::Get());
       bool ret;
 
       help.UseConfig(wxConfig::Get());
       bool ret;

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-      ret = help.AddBook(wxT(":helpfiles:testing.hhp"));
-#else

       help.SetTempDir(wxT("."));
       help.SetTempDir(wxT("."));

-      ret = help.AddBook(wxT("helpfiles/testing.hhp"));
-#endif
+      ret = help.AddBook(wxFileName(wxT("helpfiles/testing.hhp"), wxPATH_UNIX));

       if (! ret)
         wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));
       if (! ret)
         wxMessageBox(wxT("Failed adding book helpfiles/testing.hhp"));

-#if defined(__WXMAC__) && !defined(__DARWIN__)
-      ret = help.AddBook(wxT(":helpfiles:another.hhp"));
-#else
-      ret = help.AddBook(wxT("helpfiles/another.hhp"));
-#endif
+      ret = help.AddBook(wxFileName(wxT("helpfiles/another.hhp"), wxPATH_UNIX));

       if (! ret)
         wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
    }
       if (! ret)
         wxMessageBox(_("Failed adding book helpfiles/another.hhp"));
    }

diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp
index 3881c00ba9368d4b6966cbaa984db7527e31d388..d77e758829020b60ce728daff1aec2fa1015cea8 100644 (file)
--- a/samples/html/helpview/helpview.cpp
+++ b/samples/html/helpview/helpview.cpp
@@ -79,7 +79,7 @@ bool MyApp::OnInit()
     }
 
     for (int i = 1; i < argc; i++)
     }
 
     for (int i = 1; i < argc; i++)

-        help -> AddBook(argv[i]);
+        help->AddBook(wxFileName(argv[i]));

 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);
 
 #ifdef __WXMOTIF__
     delete wxLog::SetActiveTarget(new wxLogGui);