1. changed spelling error in wxTR_HAS_VARIABLE_HEIGHT (missing 'E')

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

diff --git a/include/wx/generic/helphtml.h b/include/wx/generic/helphtml.h
index dc16448f218b19df08fee49f657940a91e9472e2..647d54549c56599259fe34781a70549f3478b938 100644 (file)
--- a/include/wx/generic/helphtml.h
+++ b/include/wx/generic/helphtml.h
@@ -20,7 +20,11 @@
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   "wxhelp.map"
 /// Path separator.
 /// Name for map file.
 #define WXEXTHELP_MAPFILE   "wxhelp.map"
 /// Path separator.

+#ifdef __WXMSW__
+#define WXEXTHELP_SEPARATOR '\\'
+#else

 #define WXEXTHELP_SEPARATOR '/'
 #define WXEXTHELP_SEPARATOR '/'

+#endif

 /// Maximum line length in map file.
 #define WXEXTHELP_BUFLEN 512
 /// Character introducing comments/documentation field in map file.
 /// Maximum line length in map file.
 #define WXEXTHELP_BUFLEN 512
 /// Character introducing comments/documentation field in map file.


@@ -114,6 +118,22 @@ DECLARE_ABSTRACT_CLASS(wxHTMLHelpControllerBase)
    /// Call the browser using a relative URL.
    virtual bool DisplayHelp(wxString const &) = 0;
 
    /// Call the browser using a relative URL.
    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)
+      {
+         // does nothing by default
+      }
+   /// Obtains the latest settings used by the help frame.
+   virtual void GetFrameParameters(wxSize *size = NULL,
+                                   wxPoint *pos = NULL,
+                                   bool *newFrameEachTime = NULL)
+      {
+         // does nothing by default
+      }
+

  protected:
    /// Filename of currently active map file.
    wxString         m_MapFile;
  protected:
    /// Filename of currently active map file.
    wxString         m_MapFile;