missing commit

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

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 89bd93bb30b246423e46a781d0ee49a12187e84c..63a91351c0b860e5c4ce2738ce91e5582628c707 100644 (file)
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -1,18 +1,14 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwce.h
+// Name:        src/msw/wince/helpwce.cpp

 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Created:     2003-07-12
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-    #pragma implementation "helpwce.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -26,25 +22,25 @@
 #include "wx/msw/wince/helpwce.h"
 
 #ifndef WX_PRECOMP
 #include "wx/msw/wince/helpwce.h"
 
 #ifndef WX_PRECOMP

+    #include "wx/msw/missing.h"

     #include "wx/intl.h"
 #endif
 
 #include "wx/msw/private.h"
     #include "wx/intl.h"
 #endif
 
 #include "wx/msw/private.h"

-#include "wx/msw/missing.h"

 
 IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 
 bool wxWinceHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;
 
 IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 
 bool wxWinceHelpController::Initialize(const wxString& filename)
 {
     m_helpFile = filename;

-    return TRUE;
+    return true;

 }
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {
 }
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {

-    if (!file.IsEmpty())
+    if (!file.empty())

         m_helpFile = file;
         m_helpFile = file;

-    return TRUE;
+    return true;

 }
 
 bool wxWinceHelpController::DisplayContents()
 }
 
 bool wxWinceHelpController::DisplayContents()


@@ -59,59 +55,64 @@ bool wxWinceHelpController::DisplaySection(const wxString& section)
 }
 
 // Use context number
 }
 
 // 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)
+bool wxWinceHelpController::KeywordSearch(const wxString& WXUNUSED(k),
+                               wxHelpSearchMode WXUNUSED(mode))

 {
 {

-    return TRUE;
+    return true;

 }
 
 bool wxWinceHelpController::Quit()
 {
 }
 
 bool wxWinceHelpController::Quit()
 {

-    return TRUE;
+    return true;

 }
 
 // Append extension if necessary.
 wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;
 }
 
 // Append extension if necessary.
 wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;

-    wxSplitPath(file, & path, & name, & ext);
+    wxFileName::SplitPath(file, & path, & name, & ext);

 
     wxString fullName;
 
     wxString fullName;

-    if (path.IsEmpty())
+    if (path.empty())

         fullName = name + wxT(".htm");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".htm");
     else
         fullName = path + wxT("\\") + name + wxT(".htm");
         fullName = name + wxT(".htm");
     else if (path.Last() == wxT('\\'))
         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)
 {
     return fullName;
 }
 
 // View URL
 bool wxWinceHelpController::ViewURL(const wxString& topic)
 {

-    if (m_helpFile.IsEmpty()) return FALSE;
-    
+    if (m_helpFile.empty()) return false;
+

     wxString url( wxT("file:") + GetValidFilename(m_helpFile) );
     wxString url( wxT("file:") + GetValidFilename(m_helpFile) );

-    if (!topic.IsEmpty())
+    if (!topic.empty())

         url = url + wxT("#") + topic;
 
     return CreateProcess(wxT("peghelp.exe"),
         url = url + wxT("#") + topic;
 
     return CreateProcess(wxT("peghelp.exe"),


@@ -120,4 +121,3 @@ bool wxWinceHelpController::ViewURL(const wxString& topic)
 }
 
 #endif // wxUSE_HELP
 }
 
 #endif // wxUSE_HELP

-