diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index fa3c26e609..4735ed9391 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -105,11 +105,11 @@ public:
// Override to add custom buttons to the toolbar
virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
-protected:
// we don't want to prevent the app from closing just because a help window
// remains opened
virtual bool ShouldPreventAppExit() const { return false; }
+protected:
void Init(wxHtmlHelpData* data = NULL);
void OnCloseWindow(wxCloseEvent& event);
diff --git a/include/wx/toplevel.h b/include/wx/toplevel.h
index dbfa07ef6b..8824066fe8 100644
--- a/include/wx/toplevel.h
+++ b/include/wx/toplevel.h
@@ -173,8 +173,15 @@ public:
virtual void RequestUserAttention(int flags = wxUSER_ATTENTION_INFO);
// Is this the active frame (highlighted in the taskbar)?
- virtual bool IsActive()
- { return (wxGetTopLevelParent(FindFocus()) == this); }
+ virtual bool IsActive() { return wxGetTopLevelParent(FindFocus()) == this; }
+
+ // this function may be overridden to return false to allow closing the
+ // application even when this top level window is still open
+ //
+ // notice that the window is still closed prior to the application exit and
+ // so it can still veto it even if it returns false from here
+ virtual bool ShouldPreventAppExit() const { return true; }
+
#if defined(__SMARTPHONE__)
virtual void SetLeftMenu(int id = wxID_ANY, const wxString& label = wxEmptyString, wxMenu *subMenu = NULL) = 0;
@@ -229,13 +236,6 @@ protected:
virtual bool IsOneOfBars(const wxWindow *WXUNUSED(win)) const
{ return false; }
- // this function may be overridden to return false to allow closing the
- // application even when this top level window is still open
- //
- // notice that the window is still closed prior to the application exit and
- // so it can still veto it even if it returns false from here
- virtual bool ShouldPreventAppExit() const { return true; }
-
// check if we should exit the program after deleting this window
bool IsLastBeforeExit() const;