Add some basic tests for wxDataViewCtrl selection handling.

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

diff --git a/include/wx/html/helpctrl.h b/include/wx/html/helpctrl.h
index 271bfd759fb5e338bfeb9b9ffee7daf2c8b4e130..059333bd05f3437a860a2fd69c5897ccb3f21eed 100644 (file)
--- a/include/wx/html/helpctrl.h
+++ b/include/wx/html/helpctrl.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        helpctrl.h
+// Name:        wx/html/helpctrl.h
 // Purpose:     wxHtmlHelpController
 // Notes:       Based on htmlhelp.cpp, implementing a monolithic
 //              HTML Help controller class,  by Vaclav Slavik
@@ -35,8 +35,10 @@
 // Make the dialog modal when displaying help.
 #define wxHF_MODAL                   0x00040000
 
-class WXDLLIMPEXP_HTML wxHtmlHelpDialog;
-class WXDLLIMPEXP_HTML wxHtmlHelpWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpFrame;
+class WXDLLIMPEXP_FWD_HTML wxHtmlHelpDialog;
 
 class WXDLLIMPEXP_HTML wxHtmlHelpController : public wxHelpControllerBase // wxEvtHandler
 {
@@ -46,6 +48,8 @@ public:
     wxHtmlHelpController(int style = wxHF_DEFAULT_STYLE, wxWindow* parentWindow = NULL);
     virtual ~wxHtmlHelpController();
 
+    void SetShouldPreventAppExit(bool enable);
+
     void SetTitleFormat(const wxString& format);
     void SetTempDir(const wxString& path) { m_helpData.SetTempDir(path); }
     bool AddBook(const wxString& book_url, bool show_wait_msg = false);
@@ -61,6 +65,10 @@ public:
     wxHtmlHelpWindow* GetHelpWindow() { return m_helpWindow; }
     void SetHelpWindow(wxHtmlHelpWindow* helpWindow);
 
+    wxHtmlHelpFrame* GetFrame() { return m_helpFrame; }
+    wxHtmlHelpDialog* GetDialog() { return m_helpDialog; }
+
+#if wxUSE_CONFIG
     void UseConfig(wxConfigBase *config, const wxString& rootpath = wxEmptyString);
 
     // Assigns config object to the Ctrl. This config is then
@@ -68,6 +76,7 @@ public:
     // Ctrl and it's wxHtmlWindow
     virtual void ReadCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
     virtual void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
+#endif // wxUSE_CONFIG
 
     //// Backward compatibility with wxHelpController API
 
@@ -113,13 +122,18 @@ protected:
 
     wxHtmlHelpData      m_helpData;
     wxHtmlHelpWindow*   m_helpWindow;
+#if wxUSE_CONFIG
     wxConfigBase *      m_Config;
     wxString            m_ConfigRoot;
+#endif // wxUSE_CONFIG
     wxString            m_titleFormat;
     int                 m_FrameStyle;
-    // DECLARE_EVENT_TABLE()
+    wxHtmlHelpFrame*    m_helpFrame;
+    wxHtmlHelpDialog*   m_helpDialog;
+
+    bool                m_shouldPreventAppExit;
 
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpController)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpController);
 };
 
 /*