X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8dd71e2b5181ea24c88cbdc5a921187260b045ae..aa8fb7a0164e989e09d2b78867633399a740f1d3:/src/generic/helpwxht.cpp

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index e6210c9e13..1fdb91028c 100644
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -27,6 +27,7 @@
 #   include "wx/list.h"
 #   include "wx/intl.h"
 #   include "wx/layout.h"
+#   include "wx/combobox.h"
 #endif
 
 #include "wx/helpbase.h"
@@ -35,7 +36,9 @@
 
 #include <stdio.h>
 #include <ctype.h>
+#ifndef __MWERKS__
 #include <sys/stat.h>
+#endif
 
 #ifndef __WINDOWS__
 #   include   <unistd.h>
@@ -52,22 +55,22 @@ IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase)
 class wxForceHtmlFilter : public wxHtmlFilter
 {
 public:
-   virtual wxString ReadFile(const wxFSFile& file)
+   virtual wxString ReadFile(const wxFSFile& file) const
       {
          wxInputStream *s = file.GetStream();
          char *src;
          wxString doc;
 
          if (s == NULL) return wxEmptyString;
-         src = new char[s -> StreamSize()+1];
-         src[s -> StreamSize()] = 0;
-         s -> Read(src, s -> StreamSize());
+         src = new char[s -> GetSize()+1];
+         src[s -> GetSize()] = 0;
+         s -> Read(src, s -> GetSize());
          doc = src;
          delete [] src;
          return doc;
       }
    
-    virtual bool CanRead(const wxFSFile& file)
+    virtual bool CanRead(const wxFSFile& file) const
       {
          wxString filename = file.GetLocation();
          if(filename.Length() >= 5 &&
@@ -214,7 +217,6 @@ wxHelpFrame::wxHelpFrame(wxWindow *parent, int id,
 
 wxHelpFrame::~wxHelpFrame()
 {
-//   delete m_filter;
 }
 
 void
@@ -294,14 +296,15 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
    m_NewFrameEachTime = newFrame;
 }
 
-void
-wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
-                                         wxPoint *pos = NULL,
-                                         bool *newframe = NULL)
+wxFrame *
+wxHelpControllerHtml::GetFrameParameters(wxSize *size,
+                                         wxPoint *pos,
+                                         bool *newframe)
 {
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;
    if(newframe) *newframe = m_NewFrameEachTime;
+   return m_Frame;
 }
 
 #endif // wxUSE_HTML