Add more checks for Intel compiler.

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

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index cdb46e21af4f1c7f97d7439eaa40f2ec8673ad08..8fa798a2a59bdc50653e3f90465759a7fa1d46e0 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -4,7 +4,6 @@
 // Author:      Julian Smart
 // Modified by: Vadim Zeitlin at 2008-03-01: refactoring, simplification
 // Created:     16/04/2000
-// RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -127,7 +126,7 @@ bool wxCHMHelpController::DisplaySection(const wxString& section)
     if ( section.Find(wxT(".htm")) != wxNOT_FOUND )
     {
         // interpret as a file name
-        return CallHtmlHelp(HH_DISPLAY_TOPIC, section.wx_str());
+        return CallHtmlHelp(HH_DISPLAY_TOPIC, wxMSW_CONV_LPCTSTR(section));
     }
 
     return KeywordSearch(section);
@@ -184,7 +183,7 @@ bool wxCHMHelpController::ShowContextHelpPopup(const wxString& text,
                                                const wxPoint& pos,
                                                wxWindow *window)
 {
-    return DoDisplayTextPopup(text.wx_str(), pos, 0, window);
+    return DoDisplayTextPopup(text.t_str(), pos, 0, window);
 }
 
 bool wxCHMHelpController::DisplayBlock(long block)
@@ -201,7 +200,7 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
     HH_AKLINK link;
     link.cbStruct =     sizeof(HH_AKLINK);
     link.fReserved =    FALSE;
-    link.pszKeywords =  k.wx_str();
+    link.pszKeywords =  k.t_str();
     link.pszUrl =       NULL;
     link.pszMsgText =   NULL;
     link.pszMsgTitle =  NULL;