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 1fa93f0fe60d66d59a8dda3d3ee2baf679da47b3..f3795942288b2287801f053bfeaaa21534a58016 100644 (file)
--- a/src/msw/helpwin.cpp
+++ b/src/msw/helpwin.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpwin.cpp
+// Name:        src/msw/helpwin.cpp

 // Purpose:     Help system: WinHelp implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Help system: WinHelp implementation
 // Author:      Julian Smart
 // Modified by:


@@ -13,16 +13,15 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

+#if wxUSE_HELP
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-#include "wx/defs.h"

 #endif
 
 #endif
 

-#if wxUSE_HELP
-
-#include "wx/filefn.h"
+#include "wx/filename.h"

 #include "wx/msw/helpwin.h"
 
 #include <time.h>
 #include "wx/msw/helpwin.h"
 
 #include <time.h>


@@ -53,41 +52,37 @@ bool wxWinHelpController::Initialize(const wxString& filename)
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {
 
 bool wxWinHelpController::LoadFile(const wxString& file)
 {

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

         m_helpFile = file;
     return true;
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {
         m_helpFile = file;
     return true;
 }
 
 bool wxWinHelpController::DisplayContents(void)
 {

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

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     wxString str = GetValidFilename(m_helpFile);
 

-#if defined(__WIN95__)
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_FINDER, 0L) != 0);
-#else
-    return (WinHelp(GetSuitableHWND(this), (const wxChar*) str, HELP_CONTENTS, 0L) != 0);
-#endif
+    return (WinHelp(GetSuitableHWND(this), str.t_str(), HELP_FINDER, 0L) != 0);

 }
 
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number
 }
 
 bool wxWinHelpController::DisplaySection(int section)
 {
     // Use context number

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

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     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)
 {
 }
 
 bool wxWinHelpController::DisplayContextPopup(int contextId)
 {

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

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     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)
 }
 
 bool wxWinHelpController::DisplayBlock(long block)


@@ -99,27 +94,28 @@ bool wxWinHelpController::DisplayBlock(long block)
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {
 bool wxWinHelpController::KeywordSearch(const wxString& k,
                                         wxHelpSearchMode WXUNUSED(mode))
 {

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

 
     wxString str = GetValidFilename(m_helpFile);
 
 
     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)
 {
 }
 
 // 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;
 }
 
 // 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;
 
     wxString fullName;

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

         fullName = name + wxT(".hlp");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".hlp");
         fullName = name + wxT(".hlp");
     else if (path.Last() == wxT('\\'))
         fullName = path + name + wxT(".hlp");