Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added wxHtmlHelpController::AddBook(wxFileName)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18118 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-08 20:30:42 +00:00
parent cc37ecaf2d
commit fcf77487ed
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
docs/latex/wx/hthelpct.tex
View File

@@ -81,17 +81,27 @@ all other sections (sections, subsections, ...) have a folder icon.}
\membersection{wxHtmlHelpController::AddBook}\label{wxhtmlhelpcontrolleraddbook} \membersection{wxHtmlHelpController::AddBook}\label{wxhtmlhelpcontrolleraddbook}
\func{bool}{AddBook}{\param{const wxString\& }{book}, \param{bool }{show\_wait\_msg}} \func{bool}{AddBook}{\param{const wxFileName\& }{book\_file}, \param{bool }{show\_wait\_msg}}
\func{bool}{AddBook}{\param{const wxString\& }{book\_url}, \param{bool }{show\_wait\_msg}}
Adds book (\helpref{.hhp file}{helpformat} - HTML Help Workshop project file) into the list of loaded books. Adds book (\helpref{.hhp file}{helpformat} - HTML Help Workshop project file) into the list of loaded books.
This must be called at least once before displaying any help. This must be called at least once before displaying any help.
{\it book} may be either .hhp file or ZIP archive that contains arbitrary number of .hhp files in {\it book\_file} or {\it book\_url} may be either .hhp file or ZIP archive
that contains arbitrary number of .hhp files in
top-level directory. This ZIP archive must have .zip or .htb extension top-level directory. This ZIP archive must have .zip or .htb extension
(the latter stands for "HTML book"). In other words, {\tt AddBook("help.zip")} is possible and, in fact, (the latter stands for "HTML book"). In other words,
recommended way. {\tt AddBook(wxFileName("help.zip"))}
is possible and, in fact, recommended way.
If {\it show\_wait\_msg} is TRUE then a decoration-less window with progress message is displayed. \wxheading{Parameters}
\docparam{show\_wait\_msg}{If TRUE then a decoration-less window with progress message is displayed.}
\docparam{book\_file}{Help book filename. It is recommended to use this prototype
instead of the one taking URL, because it is less error-prone.}
\docparam{book\_url}{Help book URL (note that syntax of filename and URL is
different on most platforms)}
\wxheading{Note} \wxheading{Note}

8
docs/latex/wx/hthlpdat.tex
View File

@@ -28,11 +28,11 @@ Constructor.
\membersection{wxHtmlHelpData::AddBook}\label{wxhtmlhelpdataaddbook} \membersection{wxHtmlHelpData::AddBook}\label{wxhtmlhelpdataaddbook}
\func{bool}{AddBook}{\param{const wxString\& }{book}} \func{bool}{AddBook}{\param{const wxString\& }{book\_url}}
Adds new book. 'book' is location of HTML help project (hhp) or ZIP file Adds new book. {\it book} is URL (not filename!) of HTML help project (hhp)
that contains arbitrary number of .hhp projects (this zip file can have or ZIP file that contains arbitrary number of .hhp projects (this zip
either .zip or .htb extension, htb stands for "html book"). file can have either .zip or .htb extension, htb stands for "html book").
Returns success. Returns success.
\membersection{wxHtmlHelpData::FindPageById}\label{wxhtmlhelpdatafindpagebyid} \membersection{wxHtmlHelpData::FindPageById}\label{wxhtmlhelpdatafindpagebyid}

7
src/html/helpctrl.cpp
View File

@@ -84,6 +84,11 @@ void wxHtmlHelpController::SetTitleFormat(const wxString& title)
} }
bool wxHtmlHelpController::AddBook(const wxFileName& book_file, bool show_wait_msg)
{
return AddBook(wxFileSystem::FileNameToURL(book_file), show_wait_msg);
}
bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg) bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
{ {
wxBusyCursor cur; wxBusyCursor cur;
@@ -186,7 +191,7 @@ bool wxHtmlHelpController::Initialize(const wxString& file)
} }
} }
return AddBook(actualFilename); return AddBook(wxFileName(actualFilename));
} }
bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file)) bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))

17
src/html/helpdata.cpp
View File

@@ -570,7 +570,6 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
{ {
wxFSFile *fi; wxFSFile *fi;
wxFileSystem fsys; wxFileSystem fsys;
wxString bookFull;
wxString title = _("noname"), wxString title = _("noname"),
safetitle, safetitle,
@@ -579,23 +578,13 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
index = wxEmptyString, index = wxEmptyString,
charset = wxEmptyString; charset = wxEmptyString;
#if defined(__WXMAC__) && !defined(__DARWIN__) fi = fsys.OpenFile(book);
if (wxIsAbsolutePath(book)) bookFull = book;
else bookFull = wxGetCwd() + book; // no slash or dot
wxFileName fn( bookFull );
bookFull = fn.GetFullPath( wxPATH_UNIX );
#else
if (wxIsAbsolutePath(book)) bookFull = book;
else bookFull = wxGetCwd() + wxT("/") + book;
#endif
fi = fsys.OpenFile(bookFull);
if (fi == NULL) if (fi == NULL)
{ {
wxLogError(_("Cannot open HTML help book: %s"), bookFull.c_str()); wxLogError(_("Cannot open HTML help book: %s"), book.c_str());
return FALSE; return FALSE;
} }
fsys.ChangePathTo(bookFull); fsys.ChangePathTo(book);
const wxChar *lineptr; const wxChar *lineptr;
wxChar linebuf[300]; wxChar linebuf[300];