Fix compilation under dll builds. Wrap source files in wxUSE_WEB checks to allow...

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

diff --git a/src/msw/wince/helpwce.cpp b/src/msw/wince/helpwce.cpp
index 28958bff85505f9fdd4b9f24edb01f1410727b79..63a91351c0b860e5c4ce2738ce91e5582628c707 100644 (file)
--- a/src/msw/wince/helpwce.cpp
+++ b/src/msw/wince/helpwce.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Help system: Windows CE help implementation
 // Author:      Julian Smart
 // Modified by:


@@ -22,11 +22,11 @@
 #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)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxWinceHelpController, wxHelpControllerBase)
 


@@ -38,7 +38,7 @@ bool wxWinceHelpController::Initialize(const wxString& filename)
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {
 
 bool wxWinceHelpController::LoadFile(const wxString& file)
 {

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

         m_helpFile = file;
     return true;
 }
         m_helpFile = file;
     return true;
 }


@@ -90,10 +90,10 @@ bool wxWinceHelpController::Quit()
 wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;
 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");
         fullName = name + wxT(".htm");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".htm");


@@ -109,10 +109,10 @@ wxString wxWinceHelpController::GetValidFilename(const wxString& file) const
 // View URL
 bool wxWinceHelpController::ViewURL(const wxString& topic)
 {
 // 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"),


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

-