move m_sizeSet out of wxWindow

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

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 7066746015c38f0537e17ea7fc12d84f1a0f7ebb..61009bfb6f8dc006f705bd1317d1a34dfa52a2ae 100644 (file)
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -19,7 +19,7 @@
 
 #if wxUSE_WXHTML_HELP
 
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #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"
-#endif // WXPRECOMP
+#endif // WX_PRECOMP
 
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
@@ -242,7 +242,7 @@ void wxHtmlHelpFrame::OnAbout(wxCommandEvent& event)
 // remains opened
 bool wxHtmlHelpFrame::ShouldPreventAppExit() const
 {
-    return (this == wxTheApp->GetTopWindow());
+    return (wx_const_cast(wxHtmlHelpFrame*, this) == wxTheApp->GetTopWindow());
 }
 
 #endif // wxUSE_WXHTML_HELP