wxGetOsVersion() compilation andl inking fixes for wxMac

[wxWidgets.git] / src / msw / wince / helpwce.cpp

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 1e6a0b19a83dd55412676eb1c207cf708ed3744e..28958bff85505f9fdd4b9f24edb01f1410727b79 100644 (file)
--- 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:    wxWindows 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"
 
@@ -87,7 +83,7 @@ bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k),
 
 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;