# pragma hdrstop
#endif
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
#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/combobox.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"
else if(id == m_IdSearch)
{
wxString str = m_combo->GetValue();
- if(m_combo->FindString(str) == -1 && m_combo->Number() < MAX_COMBO_ENTRIES)
+ if(m_combo->FindString(str) == -1 && m_combo->GetCount() < MAX_COMBO_ENTRIES)
m_combo->Append(str);
m_controller->KeywordSearch(str);
}
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);
}
#endif
bool
-wxHelpControllerHtml::DisplayHelp(wxString const &relativeURL)
+wxHelpControllerHtml::DisplayHelp(const wxString &relativeURL)
{
wxBusyCursor b; // display a busy cursor