Fix 1900233: add some tweaks to allow building the NSIS Menu with wxGTK on Debian GNU/Linux.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5554 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
9da157b5ea
commit
31a6cd9180
2 changed files with 4 additions and 2 deletions
|
@ -76,7 +76,7 @@ private:
|
|||
// handlers) which process them. It can be also done at run-time, but for the
|
||||
// simple menu events like this the static method is much simpler.
|
||||
BEGIN_EVENT_TABLE(MyFrame, wxFrame)
|
||||
EVT_HTML_LINK_CLICKED(HtmlControl, OnLink)
|
||||
EVT_HTML_LINK_CLICKED(HtmlControl, MyFrame::OnLink)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// Create a new application object: this macro will allow wxWindows to create
|
||||
|
@ -139,7 +139,9 @@ private:
|
|||
m_Html->LoadPage(wxT("Menu/index.html"));
|
||||
|
||||
this->Centre(wxBOTH);
|
||||
#ifndef __WXGTK__
|
||||
this->SetIcon(wxICON(nsisicon));
|
||||
#endif
|
||||
}
|
||||
|
||||
// event handler
|
||||
|
|
|
@ -73,7 +73,7 @@ TAG_HANDLER_BEGIN(A, "A")
|
|||
if (!::wxFileExists(path) && !::wxDirExists(path))
|
||||
{
|
||||
colour = wxColour(0x80, 0x80, 0x80);
|
||||
linkInfo = wxHtmlLinkInfo("notinstalled.html", target);
|
||||
linkInfo = wxHtmlLinkInfo(wxT("notinstalled.html"), target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue