Removed TABs that had gotten in to the source

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

diff --git a/src/generic/helpwxht.cpp b/src/generic/helpwxht.cpp
index 66e90901e2311788d672bb6c0ad20480b5c24f3e..92183550679e5abac3606213aca2a5f0dc314009 100644 (file)
--- a/src/generic/helpwxht.cpp
+++ b/src/generic/helpwxht.cpp
@@ -1,6 +1,6 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        helpext.cpp
-// Purpose:     an external help controller for wxWindows
+// Name:        helpwxht.cpp
+// Purpose:     A help controller using the wxHTML classes

 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98
 // Author:      Karsten Ballueder
 // Modified by:
 // Created:     04/01/98


@@ -19,14 +19,16 @@
 #   pragma hdrstop
 #endif
 
 #   pragma hdrstop
 #endif
 

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

-#   include "wx/string.h"
-#   include "wx/utils.h"
-#   include "wx/list.h"
-#   include "wx/intl.h"
-#   include "wx/layout.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/list.h"
+    #include "wx/intl.h"
+    #include "wx/layout.h"
+    #include "wx/combobox.h"
+    #include "wx/button.h"

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


@@ -35,9 +37,11 @@
 
 #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__
+#if !defined(__WINDOWS__) && !defined(__OS2__)

 #   include   <unistd.h>
 #endif
 
 #   include   <unistd.h>
 #endif
 


@@ -52,7 +56,7 @@ 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;
       {
          wxInputStream *s = file.GetStream();
          char *src;


@@ -66,8 +70,8 @@ public:
          delete [] src;
          return doc;
       }
          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 &&


@@ -155,7 +159,7 @@ wxHelpFrame::wxHelpFrame(wxWindow *parent, int id,
    wxButton *btn_contents = new wxButton(this, m_IdContents, _("Contents"));
    m_combo = new wxComboBox(this, m_IdCombo);
    wxButton *btn_search = new wxButton(this, m_IdSearch, _("Search"));
    wxButton *btn_contents = new wxButton(this, m_IdContents, _("Contents"));
    m_combo = new wxComboBox(this, m_IdCombo);
    wxButton *btn_search = new wxButton(this, m_IdSearch, _("Search"));

-   
+

    m_filter = new wxForceHtmlFilter;
 
    wxLayoutConstraints *c;
    m_filter = new wxForceHtmlFilter;
 
    wxLayoutConstraints *c;


@@ -173,7 +177,7 @@ wxHelpFrame::wxHelpFrame(wxWindow *parent, int id,
    c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);
    c->height.AsIs();
    btn_fwd->SetConstraints(c);
    c->top.SameAs(this, wxTop, 2*LAYOUT_Y_MARGIN);
    c->height.AsIs();
    btn_fwd->SetConstraints(c);

-   
+

    c = new wxLayoutConstraints;
    c->left.SameAs(btn_fwd, wxRight, 2*LAYOUT_X_MARGIN);
    c->width.Absolute(BUTTON_WIDTH);
    c = new wxLayoutConstraints;
    c->left.SameAs(btn_fwd, wxRight, 2*LAYOUT_X_MARGIN);
    c->width.Absolute(BUTTON_WIDTH);


@@ -204,11 +208,18 @@ wxHelpFrame::wxHelpFrame(wxWindow *parent, int id,
    m_htmlwin->SetConstraints(c);
    SetAutoLayout(TRUE);
    CreateStatusBar();
    m_htmlwin->SetConstraints(c);
    SetAutoLayout(TRUE);
    CreateStatusBar();

- 
+

    m_htmlwin->SetRelatedFrame(this, title);
    m_htmlwin->SetRelatedStatusBar(0);
    m_htmlwin->AddFilter(m_filter);
 
    m_htmlwin->SetRelatedFrame(this, title);
    m_htmlwin->SetRelatedStatusBar(0);
    m_htmlwin->AddFilter(m_filter);
 

+#ifdef __WXMOTIF__
+   // Motif needs a nudge to get it to resize properly
+   // when shown
+   wxSizeEvent event(size, GetId());
+   GetEventHandler()->ProcessEvent(event);
+#endif
+

    Show(TRUE);
 }
 
    Show(TRUE);
 }
 


@@ -217,7 +228,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;


@@ -256,7 +267,7 @@ wxHelpControllerHtml::~wxHelpControllerHtml(void)
 #endif
 
 bool
 #endif
 
 bool

-wxHelpControllerHtml::DisplayHelp(wxString const &relativeURL)
+wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL)

 {
    wxBusyCursor b; // display a busy cursor
 
 {
    wxBusyCursor b; // display a busy cursor
 


@@ -294,9 +305,9 @@ wxHelpControllerHtml::SetFrameParameters(const wxString &title,
 }
 
 wxFrame *
 }
 
 wxFrame *

-wxHelpControllerHtml::GetFrameParameters(wxSize *size = NULL,
-                                         wxPoint *pos = NULL,
-                                         bool *newframe = NULL)
+wxHelpControllerHtml::GetFrameParameters(wxSize *size,
+                                         wxPoint *pos,
+                                         bool *newframe)

 {
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;
 {
    if(size) *size = m_FrameSize;
    if(pos) *pos = m_FramePosition;