use <bitmapsize> to load bitmaps at the specified size in wxToolBar's XRC handler

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

diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index 16af1ecf9286d35965e6d4b10fb04f0922f7961e..578c2c782d9269c7a19bba9c46b5e19a52e74a8a 100644 (file)
--- a/include/wx/html/helpdlg.h
+++ b/include/wx/html/helpdlg.h
@@ -32,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
 {
@@ -44,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);
@@ -66,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);
@@ -81,7 +81,7 @@ protected:
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()
-    DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);
 };
 
 #endif