simplify code so it always returns the same object

[wxWidgets.git] / src / msw / helpwin.cpp

diff --git a/src/msw/helpwin.cpp b/src/msw/helpwin.cpp
index 3b9ec5549d84da9ab2627df636da92446db22dc9..f3795942288b2287801f053bfeaaa21534a58016 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -21,7 +21,7 @@
 #ifndef WX_PRECOMP
 #endif
 
-#include "wx/filefn.h"
+#include "wx/filename.h"
 #include "wx/msw/helpwin.h"
 
 #include <time.h>
@@ -63,7 +63,7 @@ bool wxWinHelpController::DisplayContents(void)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_FINDER, 0L) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_FINDER, 0L) != 0);
 }
 
 bool wxWinHelpController::DisplaySection(int section)
@@ -73,7 +73,7 @@ bool wxWinHelpController::DisplaySection(int section)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_CONTEXT, (DWORD)section) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXT, (DWORD)section) != 0);
 }
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
@@ -82,7 +82,7 @@ bool wxWinHelpController::DisplayContextPopup(int contextId)
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_CONTEXTPOPUP, (DWORD) contextId) != 0);
 }
 
 bool wxWinHelpController::DisplayBlock(long block)
@@ -98,20 +98,21 @@ bool wxWinHelpController::KeywordSearch(const wxString& k,
 
     wxString str = GetValidFilename(m_helpFile);
 
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_PARTIALKEY, (DWORD)(const wxChar*) k) != 0);
+    return WinHelp(GetSuitableHWND(this), str.t_str(), HELP_PARTIALKEY,
+                   (ULONG_PTR)wxMSW_CONV_LPCTSTR(k)) != 0;
 }
 
 // Can't close the help window explicitly in WinHelp
 bool wxWinHelpController::Quit(void)
 {
-    return (WinHelp(GetSuitableHWND(this), 0, HELP_QUIT, 0L) != 0);
+    return WinHelp(GetSuitableHWND(this), 0, HELP_QUIT, 0) != 0;
 }
 
 // Append extension if necessary.
 wxString wxWinHelpController::GetValidFilename(const wxString& file) const
 {
     wxString path, name, ext;
-    wxSplitPath(file, & path, & name, & ext);
+    wxFileName::SplitPath(file, & path, & name, & ext);
 
     wxString fullName;
     if (path.empty())