SCROLLWIN instead of SCROLL again

[wxWidgets.git] / include / wx / generic / helphtml.h

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 07da22b3c883be34559d0b04ff169de6a15f44ee..6bf25dff3e7ef880fb620c56beab446bf14dd0cb 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -16,6 +16,7 @@
 #endif
 
 #include "wx/helpbase.h"
+#include "wx/frame.h"
 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   "wxhelp.map"
@@ -119,20 +120,20 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    virtual bool DisplayHelp(wxString const &) = 0;
 
    /// Allows one to override the default settings for the help frame.
-   virtual void SetFrameParameters(const wxString &title,
-                                   const wxSize &size,
-                                   const wxPoint &pos = wxDefaultPosition,
-                                   bool newFrameEachTime = FALSE)
+   virtual void SetFrameParameters(const wxString& WXUNUSED(title),
+                                   const wxSize& WXUNUSED(size),
+                                   const wxPoint& WXUNUSED(pos) = wxDefaultPosition,
+                                   bool WXUNUSED(newFrameEachTime) = FALSE)
       {
          // does nothing by default
       }
    /// Obtains the latest settings used by the help frame and the help 
    /// frame.
-   virtual wxFrame *GetFrameParameters(wxSize *size = NULL,
-                                   wxPoint *pos = NULL,
-                                   bool *newFrameEachTime = NULL)
+   virtual wxFrame *GetFrameParameters(wxSize *WXUNUSED(size) = NULL,
+                                   wxPoint *WXUNUSED(pos) = NULL,
+                                   bool *WXUNUSED(newFrameEachTime) = NULL)
       {
-         return NULL;// does nothing by default
+         return (wxFrame*) NULL;// does nothing by default
       }
 
  protected: