Added missing includes

[wxWidgets.git] / src / html / helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 7066746015c38f0537e17ea7fc12d84f1a0f7ebb..a9983916f7258a737e103ac6937e82a09c0425fa 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -19,7 +19,7 @@
 
 #if wxUSE_WXHTML_HELP
 
 
 #if wxUSE_WXHTML_HELP
 

-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP

     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"
     #include "wx/object.h"
     #include "wx/dynarray.h"
     #include "wx/intl.h"


@@ -40,7 +40,7 @@
     #include "wx/toolbar.h"
     #include "wx/choicdlg.h"
     #include "wx/filedlg.h"
     #include "wx/toolbar.h"
     #include "wx/choicdlg.h"
     #include "wx/filedlg.h"

-#endif // WXPRECOMP
+#endif // WX_PRECOMP

 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"


@@ -226,12 +226,12 @@ void wxHtmlHelpFrame::UseConfig(wxConfigBase *config, const wxString& rootPath)
 }
 
 #ifdef __WXMAC__
 }
 
 #ifdef __WXMAC__

-void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
+void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))

 {
     Close(true);
 }
 
 {
     Close(true);
 }
 

-void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
+void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

 {
     wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2006, Vaclav Slavik et al"), wxT("HelpView"),
         wxICON_INFORMATION|wxOK, this);
 {
     wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2006, Vaclav Slavik et al"), wxT("HelpView"),
         wxICON_INFORMATION|wxOK, this);


@@ -242,7 +242,7 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
 // remains opened
 bool wxHtmlHelpFrame::ShouldPreventAppExit() const
 {
 // remains opened
 bool wxHtmlHelpFrame::ShouldPreventAppExit() const
 {

-    return (this == wxTheApp->GetTopWindow());
+    return (wx_const_cast(wxHtmlHelpFrame*, this) == wxTheApp->GetTopWindow());

 }
 
 #endif // wxUSE_WXHTML_HELP
 }
 
 #endif // wxUSE_WXHTML_HELP