X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe828a03f46181cc172bf61739fe09a043f73aea..9c20523110b6601abd001eb6316c563ff1b53af0:/src/html/helpfrm.cpp diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp index 9ce75d6435..12437a80e3 100644 --- a/src/html/helpfrm.cpp +++ b/src/html/helpfrm.cpp @@ -81,7 +81,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data) // Simply pass the pointer on to the help window m_Data = data; m_HtmlHelpWin = NULL; - m_helpController = (wxHtmlHelpController*) NULL; + m_helpController = NULL; } void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller) @@ -100,7 +100,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, m_HtmlHelpWin->SetController(m_helpController); if ( config) m_HtmlHelpWin->UseConfig(config, rootpath); - + wxFrame::Create(parent, id, _("Help"), wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y), wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h), @@ -113,7 +113,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id, GetPosition(& (m_HtmlHelpWin->GetCfgData().x), & (m_HtmlHelpWin->GetCfgData()).y); - SetIcon(wxArtProvider::GetIcon(wxART_HELP, wxART_HELP_BROWSER)); + SetIcons(wxArtProvider::GetIconBundle(wxART_HELP, wxART_FRAME_ICON)); // On the Mac, each modeless frame must have a menubar. // TODO: add more menu items, and perhaps add a style to show