#include "wx/busyinfo.h"
#include "wx/html/helpctrl.h"
-#include "wx/html/helpwin.h"
+#include "wx/html/helpwnd.h"
#include "wx/html/helpfrm.h"
#include "wx/html/helpdlg.h"
wxHelpControllerBase(parentWindow)
{
m_helpWindow = NULL;
+ m_helpFrame = NULL;
+ m_helpDialog = NULL;
m_Config = NULL;
m_ConfigRoot = wxEmptyString;
m_titleFormat = _("Help: %s");
parent->Destroy();
m_helpWindow = NULL;
}
+ m_helpDialog = NULL;
+ m_helpFrame = NULL;
}
void wxHtmlHelpController::OnCloseFrame(wxCloseEvent& evt)
{
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
-
+
evt.Skip();
OnQuit();
- m_helpWindow->SetController(NULL);
+ if ( m_helpWindow )
+ m_helpWindow->SetController(NULL);
m_helpWindow = NULL;
+ m_helpDialog = NULL;
+ m_helpFrame = NULL;
}
void wxHtmlHelpController::SetTitleFormat(const wxString& title)
{
wxHtmlHelpFrame* frame = new wxHtmlHelpFrame(data);
frame->SetController(this);
- frame->SetTitleFormat(m_titleFormat);
- frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);
+ frame->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle, m_Config, m_ConfigRoot);
+ frame->SetTitleFormat(m_titleFormat);
+ m_helpFrame = frame;
return frame;
}
{
wxHtmlHelpDialog* dialog = new wxHtmlHelpDialog(data);
dialog->SetController(this);
- dialog->SetTitleFormat(m_titleFormat);
+ dialog->SetTitleFormat(m_titleFormat);
dialog->Create(m_parentWindow, -1, wxEmptyString, m_FrameStyle);
+ m_helpDialog = dialog;
return dialog;
}
bool wxHtmlHelpController::Initialize(const wxString& file)
{
wxString dir, filename, ext;
- wxSplitPath(file, & dir, & filename, & ext);
+ wxFileName::SplitPath(file, & dir, & filename, & ext);
if (!dir.empty())
dir = dir + wxFILE_SEP_PATH;