Changed value of wxGA_SMOOTH (clashed with wxVERTICAL)

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

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index 647d54549c56599259fe34781a70549f3478b938..68bdd47de529f547ace43945e33074c99f4548dd 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -16,6 +16,7 @@
 #endif
 
 #include "wx/helpbase.h"
 #endif
 
 #include "wx/helpbase.h"

+#include "wx/frame.h"

 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   "wxhelp.map"
 
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   "wxhelp.map"


@@ -126,12 +127,13 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
       {
          // does nothing by default
       }
       {
          // does nothing by default
       }

-   /// Obtains the latest settings used by the help frame.
-   virtual void GetFrameParameters(wxSize *size = NULL,
+   /// 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)
       {
                                    wxPoint *pos = NULL,
                                    bool *newFrameEachTime = NULL)
       {

-         // does nothing by default
+         return (wxFrame*) NULL;// does nothing by default

       }
 
  protected:
       }
 
  protected: