From 11d667e7eb2e0f984d52f4e1c02bb91b42e1c789 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 8 Dec 2002 20:30:56 +0000 Subject: [PATCH] use AddBook(wxFileName) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/html/help/help.cpp | 12 ++---------- samples/html/helpview/helpview.cpp | 2 +- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/samples/html/help/help.cpp b/samples/html/help/help.cpp index 783cda08fd..0e6ed46d88 100644 --- a/samples/html/help/help.cpp +++ b/samples/html/help/help.cpp @@ -155,19 +155,11 @@ help.UseConfig(wxConfig::Get()); bool ret; -#if defined(__WXMAC__) && !defined(__DARWIN__) - ret = help.AddBook(wxT(":helpfiles:testing.hhp")); -#else 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 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")); } diff --git a/samples/html/helpview/helpview.cpp b/samples/html/helpview/helpview.cpp index 3881c00ba9..d77e758829 100644 --- 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++) - help -> AddBook(argv[i]); + help->AddBook(wxFileName(argv[i])); #ifdef __WXMOTIF__ delete wxLog::SetActiveTarget(new wxLogGui); -- 2.47.2