FloodFill correction, wxQuantize correction

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 053f1c90df5d3a75f29846832ad932e710db76ee..7ce4bc2a7f845ea0c07e99ace03aab771cde3969 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -43,7 +43,9 @@
 #define wxHF_BOOKMARKS    0x0010
 #define wxHF_OPENFILES    0x0020
 #define wxHF_PRINT        0x0040
-#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS | wxHF_PRINT)
+#define wxHF_FLATTOOLBAR  0x0080
+#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | \
+                           wxHF_SEARCH | wxHF_BOOKMARKS | wxHF_PRINT)
 
 
 // Command IDs :
@@ -88,6 +90,7 @@ typedef struct
 wxHtmlHelpFrameCfg;
 
 
+class WXDLLEXPORT wxHelpControllerBase;
 
 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {
@@ -103,6 +106,8 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         ~wxHtmlHelpFrame();
 
         wxHtmlHelpData* GetData() { return m_Data; }
+        wxHelpControllerBase* GetController() const { return m_helpController; }
+        void SetController(wxHelpControllerBase* controller) { m_helpController = controller; }
 
         void SetTitleFormat(const wxString& format);
         // Sets format of title of the frame. Must contain exactly one "%s"
@@ -238,6 +243,7 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxHtmlEasyPrinting *m_Printer;
 #endif
         wxHashTable *m_PagesHash;
+        wxHelpControllerBase* m_helpController;
 
         DECLARE_EVENT_TABLE()
 };