X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..df91131cb0f90ee8bfb194926a13b1a108ca3c6e:/src/msw/wince/helpwce.cpp

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 32a0b7ef2e..28958bff85 100644
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -6,13 +6,9 @@
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:   	wxWidgets licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "helpwce.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -37,14 +33,14 @@ IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 bool wxWinceHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {
     if (!file.IsEmpty())
         m_helpFile = file;
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::DisplayContents()
@@ -59,35 +55,35 @@ bool wxWinceHelpController::DisplaySection(const wxString& section)
 }
 
 // Use context number
-bool wxWinceHelpController::DisplaySection(int section)
+bool wxWinceHelpController::DisplaySection(int WXUNUSED(section))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayContextPopup(int contextId)
+bool wxWinceHelpController::DisplayContextPopup(int WXUNUSED(contextId))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayTextPopup(const wxString& text, const wxPoint& pos)
+bool wxWinceHelpController::DisplayTextPopup(const wxString& WXUNUSED(text), const wxPoint& WXUNUSED(pos))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::DisplayBlock(long block)
+bool wxWinceHelpController::DisplayBlock(long WXUNUSED(block))
 {
-    return TRUE;
+    return true;
 }
 
-bool wxWinceHelpController::KeywordSearch(const wxString& k,
-                               wxHelpSearchMode mode)
+bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k),
+                               wxHelpSearchMode WXUNUSED(mode))
 {
-    return TRUE;
+    return true;
 }
 
 bool wxWinceHelpController::Quit()
 {
-    return TRUE;
+    return true;
 }
 
 // Append extension if necessary.
@@ -103,14 +99,18 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
         fullName = path + name + wxT(".htm");
     else
         fullName = path + wxT("\\") + name + wxT(".htm");
+
+    if (!wxFileExists(fullName))
+        fullName = wxT("\\Windows\\") + name + wxT(".htm");
+
     return fullName;
 }
 
 // View URL
 bool wxWinceHelpController::ViewURL(const wxString& topic)
 {
-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.IsEmpty()) return false;
+
     wxString url( wxT("file:") + GetValidFilename(m_helpFile) );
     if (!topic.IsEmpty())
         url = url + wxT("#") + topic;