removed spaces; added WXDLLEXPORTs; make overlay classes non copiable

[wxWidgets.git] / include / wx / html / helpfrm.h

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index afe7ae849f3e7df30f29a03004f0c2af072a01b0..f543ee41a8ca0b416ba7ada7833a7a73dc3e34cd 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -77,7 +77,7 @@ public:
                     int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL);
     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
                 int style = wxHF_DEFAULT_STYLE);
                     int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL);
     bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
                 int style = wxHF_DEFAULT_STYLE);

-    ~wxHtmlHelpFrame();
+    virtual ~wxHtmlHelpFrame();

 
     /// Returns the data associated with the window.
     wxHtmlHelpData* GetData() { return m_Data; }
 
     /// Returns the data associated with the window.
     wxHtmlHelpData* GetData() { return m_Data; }


@@ -105,6 +105,10 @@ public:
     // Override to add custom buttons to the toolbar
     virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
 
     // Override to add custom buttons to the toolbar
     virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {};
 

+    // 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);
 
 protected:
     void Init(wxHtmlHelpData* data = NULL);