From 31a6cd918075ec7457f924f26d8a31c9dac80c89 Mon Sep 17 00:00:00 2001 From: pabs3 Date: Sat, 23 Feb 2008 11:35:56 +0000 Subject: [PATCH] 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 --- Contrib/NSIS Menu/nsismenu/nsismenu.cpp | 4 +++- Contrib/NSIS Menu/nsismenu/nslinks.cpp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Contrib/NSIS Menu/nsismenu/nsismenu.cpp b/Contrib/NSIS Menu/nsismenu/nsismenu.cpp index 0e97d43c..684cc7d1 100644 --- a/Contrib/NSIS Menu/nsismenu/nsismenu.cpp +++ b/Contrib/NSIS Menu/nsismenu/nsismenu.cpp @@ -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 diff --git a/Contrib/NSIS Menu/nsismenu/nslinks.cpp b/Contrib/NSIS Menu/nsismenu/nslinks.cpp index 87706676..e5d3a067 100644 --- a/Contrib/NSIS Menu/nsismenu/nslinks.cpp +++ b/Contrib/NSIS Menu/nsismenu/nslinks.cpp @@ -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); } } }