// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "helpctrl.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#if wxUSE_HELP
#include "wx/tipwin.h"
#endif
-
+
#if wxUSE_LIBMSPACK
#include "wx/html/forcelnk.h"
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
-wxHtmlHelpController::wxHtmlHelpController(int style)
+wxHtmlHelpController::wxHtmlHelpController(int style, wxWindow* parentWindow):
+ wxHelpControllerBase(parentWindow)
{
m_helpFrame = NULL;
m_Config = NULL;
#if wxUSE_BUSYINFO
if (show_wait_msg)
delete busy;
+#else
+ wxUnusedVar(show_wait_msg);
#endif
- if (m_helpFrame)
+ if (m_helpFrame)
m_helpFrame->RefreshLists();
return retval;
}
if (m_Config == NULL)
{
- m_Config = wxConfigBase::Get(FALSE);
+ m_Config = wxConfigBase::Get(false);
if (m_Config != NULL)
m_ConfigRoot = _T("wxWindows/wxHtmlHelpController");
}
if (m_Config)
m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
- m_helpFrame->Create(NULL, wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
+ m_helpFrame->Create(GetParentWindow(), wxID_HTML_HELPFRAME, wxEmptyString, m_FrameStyle);
m_helpFrame->SetTitleFormat(m_titleFormat);
- m_helpFrame->Show(TRUE);
+
+ m_helpFrame->Show(true);
}
void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString& path)
wxString dir, filename, ext;
wxSplitPath(file, & dir, & filename, & ext);
- if (!dir.IsEmpty())
+ if (!dir.empty())
dir = dir + wxFILE_SEP_PATH;
// Try to find a suitable file
bool wxHtmlHelpController::LoadFile(const wxString& WXUNUSED(file))
{
// Don't reload the file or we'll have it appear again, presumably.
- return TRUE;
+ return true;
}
bool wxHtmlHelpController::DisplaySection(int sectionNo)
{
s_tipWindow = new wxTipWindow(wxTheApp->GetTopWindow(), text, 100, & s_tipWindow);
- return TRUE;
+ return true;
}
+#else
+ wxUnusedVar(text);
#endif // wxUSE_TIPWINDOW
- return FALSE;
+ return false;
}
void wxHtmlHelpController::SetFrameParameters(const wxString& title,
bool *newFrameEachTime)
{
if (newFrameEachTime)
- (* newFrameEachTime) = FALSE;
+ (* newFrameEachTime) = false;
if (size && m_helpFrame)
(* size) = m_helpFrame->GetSize();
if (pos && m_helpFrame)
bool wxHtmlHelpController::Quit()
{
DestroyHelpWindow();
- return TRUE;
+ return true;
}
// Make the help controller's frame 'modal' if
{
// So far, wxGTK only
#ifdef __WXGTK__
- bool needGrab = FALSE;
-
+ 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();
wxDialog *dialog = wxDynamicCast(win, wxDialog);
if (dialog && dialog->IsModal())
- needGrab = TRUE;
+ needGrab = true;
}
if (needGrab && m_helpFrame)
CreateHelpWindow();
bool success = m_helpFrame->Display(x);
AddGrabIfNeeded();
- return success;
+ return success;
}
bool wxHtmlHelpController::Display(int id)