X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3e156efb09c5c3ab4c4490abf58f2348edb1150..58ce18f2fdadecffb21e27555115af708325cf18:/include/wx/html/helpdlg.h diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h index 60ff9d4818..dd51284d23 100644 --- a/include/wx/html/helpdlg.h +++ b/include/wx/html/helpdlg.h @@ -1,27 +1,24 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: helpdlg.h +// Name: wx/html/helpdlg.h // Purpose: wxHtmlHelpDialog // Notes: Based on htmlhelp.cpp, implementing a monolithic // HTML Help controller class, by Vaclav Slavik // Author: Harm van der Heijden, Vaclav Slavik, Julian Smart // RCS-ID: $Id$ // Copyright: (c) Harm van der Heijden, Vaclav Slavik, Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_HELPDLG_H_ #define _WX_HELPDLG_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "helpdlgex.h" -#endif - #include "wx/defs.h" #if wxUSE_WXHTML_HELP #include "wx/html/helpdata.h" #include "wx/window.h" +#include "wx/dialog.h" #include "wx/frame.h" #include "wx/config.h" #include "wx/splitter.h" @@ -35,8 +32,8 @@ #include "wx/html/helpwnd.h" #include "wx/html/htmprint.h" -class WXDLLIMPEXP_HTML wxHtmlHelpController; -class WXDLLIMPEXP_HTML wxHtmlHelpWindow; +class WXDLLIMPEXP_FWD_HTML wxHtmlHelpController; +class WXDLLIMPEXP_FWD_HTML wxHtmlHelpWindow; class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog { @@ -47,7 +44,7 @@ public: wxHtmlHelpDialog(wxWindow* parent, wxWindowID wxWindowID, const wxString& title = wxEmptyString, int style = wxHF_DEFAULT_STYLE, wxHtmlHelpData* data = NULL); - ~wxHtmlHelpDialog(); + virtual ~wxHtmlHelpDialog(); bool Create(wxWindow* parent, wxWindowID id, const wxString& title = wxEmptyString, int style = wxHF_DEFAULT_STYLE); @@ -69,7 +66,7 @@ public: void SetTitleFormat(const wxString& format); // Override to add custom buttons to the toolbar - virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {}; + virtual void AddToolbarButtons(wxToolBar* WXUNUSED(toolBar), int WXUNUSED(style)) {} protected: void Init(wxHtmlHelpData* data = NULL); @@ -84,11 +81,10 @@ protected: wxHtmlHelpController* m_helpController; DECLARE_EVENT_TABLE() - DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog) + wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog); }; #endif // wxUSE_WXHTML_HELP #endif -