X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9b21c9f47f59f36d73220270002b55a7babfdfc..245f35816d761212279e8cf223475efb7a367553:/src/html/helpfrm.cpp

diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index 332129b273..5191e19ecd 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -35,6 +35,11 @@
     #include "wx/radiobox.h"
 #endif // WXPRECOMP
 
+#ifdef __WXMAC__
+    #include "wx/menu.h"
+    #include "wx/msgdlg.h"
+#endif
+
 #include "wx/html/helpfrm.h"
 #include "wx/html/helpctrl.h"
 #include "wx/textctrl.h"
@@ -108,7 +113,9 @@ class wxHtmlHelpHtmlWindow : public wxHtmlWindow
         virtual void OnLinkClicked(const wxHtmlLinkInfo& link)
         {
             wxHtmlWindow::OnLinkClicked(link);
-            m_Frame->NotifyPageChanged();
+            const wxMouseEvent *e = link.GetEvent();
+            if (e == NULL || e->LeftUp())
+                m_Frame->NotifyPageChanged();
         }
 
     private:
@@ -260,14 +267,14 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
 
     wxMenu* fileMenu = new wxMenu;
     fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
-    fileMenu->Append(wxID_ABOUT, _("&About..."));
     fileMenu->AppendSeparator();
     fileMenu->Append(wxID_CLOSE, _("&Close"));
 
-//    wxMenu* helpMenu = new wxMenu;
-//    helpMenu->Append(wxID_ABOUT, _("&About..."));
+    wxMenu* helpMenu = new wxMenu;
+    helpMenu->Append(wxID_ABOUT, _("&About..."));
 
-    menuBar->Append(fileMenu);
+    menuBar->Append(fileMenu,_("File"));
+    menuBar->Append(helpMenu,_("Help"));
     SetMenuBar(menuBar);
 #endif
 
@@ -1517,7 +1524,7 @@ void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
 }
 
 #ifdef __WXMAC__
-void wxHtmlHelpFrame::OnQuit(wxCommandEvent& event)
+void wxHtmlHelpFrame::OnClose(wxCommandEvent& event)
 {
     Close(TRUE);
 }
@@ -1545,7 +1552,7 @@ BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
     EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
     EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
 #ifdef __WXMAC__
-    EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnQuit)
+    EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnClose)
     EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
 #endif