Added ability to switch off more components of the size page UI

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

diff --git a/src/msw/helpchm.cpp b/src/msw/helpchm.cpp
index cdb46e21af4f1c7f97d7439eaa40f2ec8673ad08..2c33e930d92e52c111f94c3916e2943016996593 100644 (file)
--- a/src/msw/helpchm.cpp
+++ b/src/msw/helpchm.cpp
@@ -127,7 +127,7 @@ bool wxCHMHelpController::DisplaySection(const wxString& section)
     if ( section.Find(wxT(".htm")) != wxNOT_FOUND )
     {
         // interpret as a file name
     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);
     }
 
     return KeywordSearch(section);


@@ -184,7 +184,7 @@ bool wxCHMHelpController::ShowContextHelpPopup(const wxString& text,
                                                const wxPoint& pos,
                                                wxWindow *window)
 {
                                                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)
 }
 
 bool wxCHMHelpController::DisplayBlock(long block)


@@ -201,7 +201,7 @@ bool wxCHMHelpController::KeywordSearch(const wxString& k,
     HH_AKLINK link;
     link.cbStruct =     sizeof(HH_AKLINK);
     link.fReserved =    FALSE;
     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;
     link.pszUrl =       NULL;
     link.pszMsgText =   NULL;
     link.pszMsgTitle =  NULL;