From ac0ab0af7cdd658ad017f5aed13e542b025660e0 Mon Sep 17 00:00:00 2001
From: Julian Smart <julian@anthemion.co.uk>
Date: Mon, 9 Dec 2002 18:37:20 +0000
Subject: [PATCH] Backported some helpview fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@18168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 utils/helpview/src/helpview.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index fcf850759c..4020230846 100644
--- a/utils/helpview/src/helpview.cpp
+++ b/utils/helpview/src/helpview.cpp
@@ -60,9 +60,7 @@ bool hvApp::OnInit()
 	
     wxArtProvider::PushProvider(new AlternateArtProvider);
 	
-	int istyle = wxHF_DEFAULT_STYLE;
-	
-    wxArtProvider::PushProvider(new AlternateArtProvider);
+    int istyle = wxHF_DEFAULT_STYLE;
 	
     wxString service, windowName, book[10], titleFormat, argStr;
     int bookCount = 0;
@@ -71,6 +69,10 @@ bool hvApp::OnInit()
     bool hasWindowName = FALSE;
     bool createServer = FALSE;
 	
+#if hvUSE_IPC
+    m_server = NULL;
+#endif
+	
     // Help books are recognized by extension ".hhp" ".htb" or ".zip".
     // Service and window_name can occur anywhere in arguments,
     // but service must be first
@@ -198,7 +200,8 @@ bool hvApp::OnInit()
 	
     for( i=0; i < bookCount; i++ )
     {
-		m_helpController->AddBook(book[i]);
+        wxFileName fileName(book[i]);
+		m_helpController->AddBook(fileName);
     }
 	
 #ifdef __WXMOTIF__
@@ -256,7 +259,8 @@ bool hvApp::OpenBook(wxHtmlHelpController* controller)
         if (ext == _T(".zip") || ext == _T(".htb") || ext == _T(".hhp"))
         {
             wxBusyCursor bcur;
-            controller->AddBook(s);
+            wxFileName fileName(s);
+            controller->AddBook(fileName);
             return TRUE;
         }
     }
@@ -490,4 +494,4 @@ bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
 }
 
 #endif
-    // hvUSE_IPC
\ No newline at end of file
+    // hvUSE_IPC