Applied cross-compile patch from Stephen Crowley

[wxWidgets.git] / utils / helpview / src / helpview.cpp

diff --git a/utils/helpview/src/helpview.cpp b/utils/helpview/src/helpview.cpp
index d16e92f0ff7e7b0ea57d382fa7c6675f709da1f7..40202308466f47c0e67439c3cc062790dd1b5108 100644 (file)
--- 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,7 +69,9 @@ 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,
@@ -200,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__
@@ -258,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;
         }
     }
@@ -492,4 +494,4 @@ bool hvConnection::OnStartAdvise(const wxString& WXUNUSED(topic),
 }
 
 #endif
-    // hvUSE_IPC
\ No newline at end of file
+    // hvUSE_IPC