/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation
+#pragma implementation "helpctrl.h"
#endif
// For compilers that support precompilation, includes "wx.h".
#pragma hdrstop
#endif
-#include "wx/defs.h"
+#if wxUSE_WXHTML_HELP
-#if wxUSE_HTML && wxUSE_STREAMS
+#ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/intl.h"
+#endif // WX_PRECOMP
#include "wx/html/helpctrl.h"
-#include "wx/wx.h"
#include "wx/busyinfo.h"
+#ifdef __WXGTK__
+ // for the hack in AddGrabIfNeeded()
+ #include "wx/dialog.h"
+#endif // __WXGTK__
+
#if wxUSE_HELP
-#include "wx/tipwin.h"
+ #include "wx/tipwin.h"
#endif
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
}
+bool wxHtmlHelpController::AddBook(const wxFileName& book_file, bool show_wait_msg)
+{
+ return AddBook(wxFileSystem::FileNameToURL(book_file), show_wait_msg);
+}
+
bool wxHtmlHelpController::AddBook(const wxString& book, bool show_wait_msg)
{
wxBusyCursor cur;
if (show_wait_msg)
delete busy;
#endif
+ if (m_helpFrame)
+ m_helpFrame->RefreshLists();
return retval;
}
wxSplitPath(file, & dir, & filename, & ext);
if (!dir.IsEmpty())
- dir = dir + wxString(wxT("/"));
+ dir = dir + wxFILE_SEP_PATH;
// Try to find a suitable file
wxString actualFilename = dir + filename + wxString(wxT(".zip"));
}
}
- return AddBook(actualFilename);
+ return AddBook(wxFileName(actualFilename));
}
bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
bool wxHtmlHelpController::DisplayTextPopup(const wxString& text, const wxPoint& WXUNUSED(pos))
{
-#if wxUSE_HELP
+#if wxUSE_TIPWINDOW
static wxTipWindow* s_tipWindow = NULL;
if (s_tipWindow)
return TRUE;
}
-#endif
+#endif // wxUSE_TIPWINDOW
+
return FALSE;
}
return TRUE;
}
-#endif
+// Make the help controller's frame 'modal' if
+// needed
+void wxHtmlHelpController::AddGrabIfNeeded()
+{
+ // So far, wxGTK only
+#ifdef __WXGTK__
+ bool needGrab = FALSE;
+
+ // Check if there are any modal windows present,
+ // in which case we need to add a grab.
+ for ( wxWindowList::compatibility_iterator node = wxTopLevelWindows.GetFirst();
+ node;
+ node = node->GetNext() )
+ {
+ wxWindow *win = node->GetData();
+ wxDialog *dialog = wxDynamicCast(win, wxDialog);
+
+ if (dialog && dialog->IsModal())
+ needGrab = TRUE;
+ }
+
+ if (needGrab && m_helpFrame)
+ m_helpFrame->AddGrab();
+#endif // __WXGTK__
+}
+
+bool wxHtmlHelpController::Display(const wxString& x)
+{
+ CreateHelpWindow();
+ bool success = m_helpFrame->Display(x);
+ AddGrabIfNeeded();
+ return success;
+}
+
+bool wxHtmlHelpController::Display(int id)
+{
+ CreateHelpWindow();
+ bool success = m_helpFrame->Display(id);
+ AddGrabIfNeeded();
+ return success;
+}
+
+bool wxHtmlHelpController::DisplayContents()
+{
+ CreateHelpWindow();
+ bool success = m_helpFrame->DisplayContents();
+ AddGrabIfNeeded();
+ return success;
+}
+
+bool wxHtmlHelpController::DisplayIndex()
+{
+ CreateHelpWindow();
+ bool success = m_helpFrame->DisplayIndex();
+ AddGrabIfNeeded();
+ return success;
+}
+
+bool wxHtmlHelpController::KeywordSearch(const wxString& keyword)
+{
+ CreateHelpWindow();
+ bool success = m_helpFrame->KeywordSearch(keyword);
+ AddGrabIfNeeded();
+ return success;
+}
+
+#endif // wxUSE_WXHTML_HELP
+