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

Backported some helpview fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-09 18:37:20 +00:00
parent 9c3ae8f70d
commit ac0ab0af7c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
utils/helpview/src/helpview.cpp
View File

@@ -60,9 +60,7 @@ bool hvApp::OnInit()
wxArtProvider::PushProvider(new AlternateArtProvider); wxArtProvider::PushProvider(new AlternateArtProvider);
int istyle = wxHF_DEFAULT_STYLE; int istyle = wxHF_DEFAULT_STYLE;
wxArtProvider::PushProvider(new AlternateArtProvider);
wxString service, windowName, book[10], titleFormat, argStr; wxString service, windowName, book[10], titleFormat, argStr;
int bookCount = 0; int bookCount = 0;
@@ -71,6 +69,10 @@ bool hvApp::OnInit()
bool hasWindowName = FALSE; bool hasWindowName = FALSE;
bool createServer = FALSE; bool createServer = FALSE;
#if hvUSE_IPC
m_server = NULL;
#endif
// Help books are recognized by extension ".hhp" ".htb" or ".zip". // Help books are recognized by extension ".hhp" ".htb" or ".zip".
// Service and window_name can occur anywhere in arguments, // Service and window_name can occur anywhere in arguments,
// but service must be first // but service must be first
@@ -198,7 +200,8 @@ bool hvApp::OnInit()
for( i=0; i < bookCount; i++ ) for( i=0; i < bookCount; i++ )
{ {
m_helpController->AddBook(book[i]); wxFileName fileName(book[i]);
m_helpController->AddBook(fileName);
} }
#ifdef __WXMOTIF__ #ifdef __WXMOTIF__
@@ -256,7 +259,8 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp")) if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
{ {
wxBusyCursor bcur; wxBusyCursor bcur;
controller->AddBook(s); wxFileName fileName(s);
controller->AddBook(fileName);
return TRUE; return TRUE;
} }
} }