1. some patches from Janos Vegh to docview template detection

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

diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 437314805bd49a4c5e5b83aaf415db141ae08731..5ac3a97957811621ed068709a040068ba4532f83 100644 (file)
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -88,6 +88,7 @@ typedef struct
 wxHtmlHelpFrameCfg;
 
 
 wxHtmlHelpFrameCfg;
 
 

+class WXDLLEXPORT wxHelpControllerBase;

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


@@ -95,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,


@@ -103,6 +104,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"


@@ -238,6 +241,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()
 };