diff --git a/include/wx/html/helpfrm.h b/include/wx/html/helpfrm.h
index 6bd3153493..6b09d0d3da 100644
--- a/include/wx/html/helpfrm.h
+++ b/include/wx/html/helpfrm.h
@@ -126,11 +126,6 @@ protected:
void OnCloseWindow(wxCloseEvent& event);
void OnActivate(wxActivateEvent& event);
-#ifdef __WXMAC__
- void OnClose(wxCommandEvent& event);
- void OnAbout(wxCommandEvent& event);
-#endif
-
// Images:
enum {
IMG_Book = 0,
diff --git a/src/html/helpfrm.cpp b/src/html/helpfrm.cpp
index bf3f897496..e259cca81f 100644
--- a/src/html/helpfrm.cpp
+++ b/src/html/helpfrm.cpp
@@ -60,11 +60,6 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxHtmlHelpFrame, wxFrame);
wxBEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_ACTIVATE(wxHtmlHelpFrame::OnActivate)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
-#ifdef __WXMAC__
- EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::OnClose)
- EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
- EVT_MENU(wxID_HELP_CONTENTS, wxHtmlHelpFrame::OnAbout)
-#endif
wxEND_EVENT_TABLE()
wxHtmlHelpFrame::wxHtmlHelpFrame(wxWindow* parent, wxWindowID id, const wxString& title,
@@ -127,27 +122,6 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
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
- // the menubar: compulsory on the Mac, optional elsewhere.
-#ifdef __WXMAC__
- wxMenuBar* menuBar = new wxMenuBar;
-
- wxMenu* fileMenu = new wxMenu;
- fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
- fileMenu->AppendSeparator();
- fileMenu->Append(wxID_CLOSE, _("&Close"));
-
- wxMenu* helpMenu = new wxMenu;
- helpMenu->Append(wxID_ABOUT, _("&About"));
- // Ensures we don't get an empty help menu
- helpMenu->Append(wxID_HELP_CONTENTS, _("&About"));
-
- menuBar->Append(fileMenu,_("&File"));
- menuBar->Append(helpMenu,_("&Help"));
- SetMenuBar(menuBar);
-#endif
-
m_HtmlHelpWin->GetHtmlWindow()->SetRelatedFrame(this, m_TitleFormat);
#if wxUSE_STATUSBAR
m_HtmlHelpWin->GetHtmlWindow()->SetRelatedStatusBar(0);
@@ -251,17 +225,4 @@ void wxHtmlHelpFrame::SetShouldPreventAppExit(bool enable)
m_shouldPreventAppExit = enable;
}
-#ifdef __WXMAC__
-void wxHtmlHelpFrame::OnClose(wxCommandEvent& WXUNUSED(event))
-{
- Close(true);
-}
-
-void wxHtmlHelpFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
-{
- wxMessageBox(wxT("wxWidgets HTML Help Viewer (c) 1998-2006, Vaclav Slavik et al"), wxT("HelpView"),
- wxICON_INFORMATION|wxOK, this);
-}
-#endif
-
#endif // wxUSE_WXHTML_HELP