some warnings suppressed

[wxWidgets.git] / src / generic / helpwxht.cpp

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 2dc02e2b10e47a591687736c955380aec2a2ef37..dc7f167a13639f6680f2dbeda0034429a8104195 100644 (file)
--- 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/list.h"
 #   include "wx/intl.h"
 #   include "wx/layout.h"

+#   include "wx/combobox.h"

 #endif
 
 #include "wx/helpbase.h"
 #endif
 
 #include "wx/helpbase.h"


@@ -35,7 +36,9 @@
 
 #include <stdio.h>
 #include <ctype.h>
 
 #include <stdio.h>
 #include <ctype.h>

+#ifndef __MWERKS__

 #include <sys/stat.h>
 #include <sys/stat.h>

+#endif

 
 #ifndef __WINDOWS__
 #   include   <unistd.h>
 
 #ifndef __WINDOWS__
 #   include   <unistd.h>


@@ -52,22 +55,22 @@ IMPLEMENT_CLASS(wxHelpControllerHtml, wxHTMLHelpControllerBase)
 class wxForceHtmlFilter : public wxHtmlFilter
 {
 public:
 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;
       {
          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;
       }
    
          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 &&
       {
          wxString filename = file.GetLocation();
          if(filename.Length() >= 5 &&


@@ -217,7 +220,7 @@ wxHelpFrame::~wxHelpFrame()
 }
 
 void
 }
 
 void

-wxHelpFrame::OnClose(wxCloseEvent &ev)
+wxHelpFrame::OnClose(wxCloseEvent &WXUNUSED(ev))

 {
    wxASSERT(m_controller);
    m_controller->m_Frame = NULL;
 {
    wxASSERT(m_controller);
    m_controller->m_Frame = NULL;


@@ -293,14 +296,15 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
    m_NewFrameEachTime = newFrame;
 }
 
    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;
 {
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;
    if(newframe) *newframe = m_NewFrameEachTime;

+   return m_Frame;

 }
 
 #endif // wxUSE_HTML
 }
 
 #endif // wxUSE_HTML