Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / msw / helpchm.h

diff --git a/include/wx/msw/helpchm.h b/include/wx/msw/helpchm.h
index a1fbe91034b9397638cc65e6c7fe2a804bdaf0f1..8d139155b0894106e22f62546751b6271354461f 100644 (file)
--- a/include/wx/msw/helpchm.h
+++ b/include/wx/msw/helpchm.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpchm.h
+// Name:        wx/msw/helpchm.h

 // Purpose:     Help system: MS HTML Help implementation
 // Author:      Julian Smart
 // Modified by:
 // Purpose:     Help system: MS HTML Help implementation
 // Author:      Julian Smart
 // Modified by:


@@ -63,7 +63,7 @@ protected:
     // the first 2 HtmlHelp() parameters
     bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
     {
     // the first 2 HtmlHelp() parameters
     bool CallHtmlHelp(unsigned cmd, WXWPARAM param)
     {

-        return CallHtmlHelp(GetParentWindow(), GetValidFilename().wx_str(),
+        return CallHtmlHelp(GetParentWindow(), GetValidFilename().t_str(),

                             cmd, param);
     }
 
                             cmd, param);
     }
 


@@ -82,7 +82,7 @@ protected:
 
     wxString m_helpFile;
 
 
     wxString m_helpFile;
 

-    DECLARE_CLASS(wxCHMHelpController)
+    DECLARE_DYNAMIC_CLASS(wxCHMHelpController)

 };
 
 #endif // wxUSE_MS_HTML_HELP
 };
 
 #endif // wxUSE_MS_HTML_HELP