moved wxDash typedef to gdicmn.h

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 80256d84afc6fe9507a365148070ef62d975e554..5ac3a97957811621ed068709a040068ba4532f83 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -32,6 +32,7 @@
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"
 #include "wx/checkbox.h"
 #include "wx/stattext.h"
 #include "wx/html/htmlwin.h"

+#include "wx/html/htmprint.h"

 
 
 // style flags for the Help Frame
 
 
 // style flags for the Help Frame


@@ -40,7 +41,9 @@
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
 #define wxHF_BOOKMARKS    0x0010
 #define wxHF_INDEX        0x0004
 #define wxHF_SEARCH       0x0008
 #define wxHF_BOOKMARKS    0x0010

-#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS)
+#define wxHF_OPENFILES    0x0020
+#define wxHF_PRINT        0x0040
+#define wxHF_DEFAULTSTYLE (wxHF_TOOLBAR | wxHF_CONTENTS | wxHF_INDEX | wxHF_SEARCH | wxHF_BOOKMARKS | wxHF_PRINT)

 
 
 // Command IDs :
 
 
 // Command IDs :


@@ -49,6 +52,11 @@ enum
     wxID_HTML_PANEL = wxID_HIGHEST + 1,
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,
     wxID_HTML_PANEL = wxID_HIGHEST + 1,
     wxID_HTML_BACK,
     wxID_HTML_FORWARD,

+    wxID_HTML_UPNODE,
+    wxID_HTML_UP,
+    wxID_HTML_DOWN,
+    wxID_HTML_PRINT,
+    wxID_HTML_OPENFILE,

     wxID_HTML_OPTIONS,
     wxID_HTML_BOOKMARKSLIST,
     wxID_HTML_BOOKMARKSADD,
     wxID_HTML_OPTIONS,
     wxID_HTML_BOOKMARKSLIST,
     wxID_HTML_BOOKMARKSADD,


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

+class WXDLLEXPORT wxHelpControllerBase;

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


@@ -87,7 +96,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,


@@ -95,13 +104,10 @@ 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)
-        {
-            if (m_HtmlWin)
-                m_HtmlWin->SetRelatedFrame(this, format);
-            m_TitleFormat = format;
-        }
+        void SetTitleFormat(const wxString& format);

         // Sets format of title of the frame. Must contain exactly one "%s"
         // (for title of displayed HTML page)
 
         // Sets format of title of the frame. Must contain exactly one "%s"
         // (for title of displayed HTML page)
 


@@ -146,6 +152,9 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         // saved values : things set by SetFonts, SetBorders.
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...
         // saved values : things set by SetFonts, SetBorders.
         void WriteCustomization(wxConfigBase *cfg, const wxString& path = wxEmptyString);
         // ...

+        
+        void NotifyPageChanged();
+        // call this to let wxHtmlHelpFrame know page changed

 
     protected:
         void Init(wxHtmlHelpData* data = NULL);
 
     protected:
         void Init(wxHtmlHelpData* data = NULL);


@@ -162,6 +171,8 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         void CreateSearch();
         // Add books to search choice panel
 
         void CreateSearch();
         // Add books to search choice panel
 

+        virtual void AddToolbarButtons(wxToolBar *toolBar, int style);
+        // Add custom buttons to toolbar

 
         virtual void OptionsDialog();
         // Displays options dialog (fonts etc.)
 
         virtual void OptionsDialog();
         // Displays options dialog (fonts etc.)


@@ -223,6 +234,14 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
         wxArrayString *m_NormalFonts, *m_FixedFonts;
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;
         wxArrayString *m_NormalFonts, *m_FixedFonts;
         int m_FontSize; // 0,1,2 = small,medium,big
         wxString m_NormalFace, m_FixedFace;

+        
+        bool m_UpdateContents;
+
+#if wxUSE_PRINTING_ARCHITECTURE
+        wxHtmlEasyPrinting *m_Printer;
+#endif
+        wxHashTable *m_PagesHash;
+        wxHelpControllerBase* m_helpController;

 
         DECLARE_EVENT_TABLE()
 };
 
         DECLARE_EVENT_TABLE()
 };