Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merged 2.2 branch

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2000-07-15 19:51:35 +00:00
parent 8a693e6e04
commit f6bcfd974e
1835 changed files with 237729 additions and 67990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/helpctrl.cpp
View File

@@ -22,7 +22,7 @@
#include "wx/defs.h"
#if wxUSE_HTML
#if wxUSE_HTML && wxUSE_STREAMS
#include "wx/html/helpctrl.h"
#include "wx/wx.h"
@@ -30,12 +30,6 @@
IMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpController, wxHelpControllerBase)
#if 0
BEGIN_EVENT_TABLE(wxHtmlHelpController, wxEvtHandler)
EVT_CLOSE(wxHtmlHelpController::OnCloseFrame)
END_EVENT_TABLE()
#endif
wxHtmlHelpController::wxHtmlHelpController(int style)
{
m_helpFrame = NULL;
@@ -47,7 +41,8 @@ wxHtmlHelpController::wxHtmlHelpController(int style)
wxHtmlHelpController::~wxHtmlHelpController()
{
WriteCustomization(m_Config, m_ConfigRoot);
if (m_Config)
WriteCustomization(m_Config, m_ConfigRoot);
if (m_helpFrame)
DestroyHelpWindow();
}
@@ -121,7 +116,6 @@ void wxHtmlHelpController::CreateHelpWindow()
m_helpFrame = CreateHelpFrame(&m_helpData);
m_helpFrame->SetController(this);
// m_helpFrame->PushEventHandler(this);
if (m_Config)
m_helpFrame->UseConfig(m_Config, m_ConfigRoot);
@@ -135,14 +129,14 @@ void wxHtmlHelpController::ReadCustomization(wxConfigBase* cfg, const wxString&
{
/* should not be called by the user; call UseConfig, and the controller
* will do the rest */
if (m_helpFrame)
if (m_helpFrame && cfg)
m_helpFrame->ReadCustomization(cfg, path);
}
void wxHtmlHelpController::WriteCustomization(wxConfigBase* cfg, const wxString& path)
{
/* typically called by the controllers OnCloseFrame handler */
if (m_helpFrame)
if (m_helpFrame && cfg)
m_helpFrame->WriteCustomization(cfg, path);
}