Compilo.

[wxWidgets.git] / src / html / helpctrl.cpp

diff --git a/src/html/helpctrl.cpp b/src/html/helpctrl.cpp
index 7fd16b47063faf586f7ca9ad1b94fcafcc53a18f..87be6838d1d4fc3e73e694672fbb56bb58a5c2f8 100644 (file)
--- a/src/html/helpctrl.cpp
+++ b/src/html/helpctrl.cpp
@@ -6,7 +6,7 @@
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik
 // Author:      Harm van der Heijden and Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) Harm van der Heijden and Vaclav Slavik

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)


@@ -111,6 +111,8 @@ bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;
 #if wxUSE_BUSYINFO
     if (show_wait_msg)
         delete busy;

+#else
+    wxUnusedVar(show_wait_msg);

 #endif
     if (m_helpFrame) 
         m_helpFrame->RefreshLists();
 #endif
     if (m_helpFrame) 
         m_helpFrame->RefreshLists();


@@ -137,7 +139,7 @@ void wxHtmlHelpController::CreateHelpWindow()
     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)
     {
         m_Config = wxConfigBase::Get(FALSE);
         if (m_Config != NULL)

-            m_ConfigRoot = _T("wxWidgets/wxHtmlHelpController");
+            m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");

     }
 
     m_helpFrame = CreateHelpFrame(&m_helpData);
     }
 
     m_helpFrame = CreateHelpFrame(&m_helpData);