wxNativeFontInfo changes

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 437314805bd49a4c5e5b83aaf415db141ae08731..9bcf7574a4cf13df3f02e5855bcbb053a8ab3040 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_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 :
 
 
 // Command IDs :


@@ -88,6 +90,7 @@ typedef struct
 wxHtmlHelpFrameCfg;
 
 
 wxHtmlHelpFrameCfg;
 
 

+class WXDLLEXPORT wxHelpControllerBase;

 
 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {
 
 class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 {


@@ -95,7 +98,7 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
 
     public:
         wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }
 
     public:
         wxHtmlHelpFrame(wxHtmlHelpData* data = NULL) { Init(data); }

-        wxHtmlHelpFrame(wxWindow* parent, int wxWindowID,
+        wxHtmlHelpFrame(wxWindow* parent, wxWindowID wxWindowID,

                         const wxString& title = wxEmptyString,
                         int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL);
         bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,
                         const wxString& title = wxEmptyString,
                         int style = wxHF_DEFAULTSTYLE, wxHtmlHelpData* data = NULL);
         bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString,


@@ -103,6 +106,8 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         ~wxHtmlHelpFrame();
 
         wxHtmlHelpData* GetData() { return m_Data; }
         ~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"
 
         void SetTitleFormat(const wxString& format);
         // Sets format of title of the frame. Must contain exactly one "%s"


@@ -201,7 +206,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxSplitterWindow *m_Splitter;
         wxNotebook *m_NavigPan;
         wxTreeCtrl *m_ContentsBox;
         wxSplitterWindow *m_Splitter;
         wxNotebook *m_NavigPan;
         wxTreeCtrl *m_ContentsBox;

-        wxImageList *m_ContentsImageList;

         wxTextCtrl *m_IndexText;
         wxButton *m_IndexButton;
         wxButton *m_IndexButtonAll;
         wxTextCtrl *m_IndexText;
         wxButton *m_IndexButton;
         wxButton *m_IndexButtonAll;


@@ -238,6 +242,7 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxHtmlEasyPrinting *m_Printer;
 #endif
         wxHashTable *m_PagesHash;
         wxHtmlEasyPrinting *m_Printer;
 #endif
         wxHashTable *m_PagesHash;

+        wxHelpControllerBase* m_helpController;

 
         DECLARE_EVENT_TABLE()
 };
 
         DECLARE_EVENT_TABLE()
 };