fix loading ICO from socket stream: override OnSysTell and OnSysSeek rather than...

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

diff --git a/include/wx/html/helpdlg.h b/include/wx/html/helpdlg.h
index 832224824c2db956d65e4eb43871fa14fe6ebd90..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"
 
 #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
 {
 
 class WXDLLIMPEXP_HTML wxHtmlHelpDialog : public wxDialog
 {


@@ -66,7 +66,7 @@ public:
     void SetTitleFormat(const wxString& format);
 
     // Override to add custom buttons to the toolbar
     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);
 
 protected:
     void Init(wxHtmlHelpData* data = NULL);


@@ -81,7 +81,7 @@ protected:
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()
     wxHtmlHelpController* m_helpController;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxHtmlHelpDialog)
+    wxDECLARE_NO_COPY_CLASS(wxHtmlHelpDialog);

 };
 
 #endif
 };
 
 #endif