projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 710608 ] wxImage::GetImageExtWildcard for image load/save dialogs.
[wxWidgets.git]
/
src
/
html
/
helpfrm.cpp
diff --git
a/src/html/helpfrm.cpp
b/src/html/helpfrm.cpp
index 332129b27366588cd62b5947ab1a27621b23478d..d01ec35ffb694a6f3f7ff00da4f05820303701ba 100644
(file)
--- a/
src/html/helpfrm.cpp
+++ b/
src/html/helpfrm.cpp
@@
-35,6
+35,11
@@
#include "wx/radiobox.h"
#endif // WXPRECOMP
#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"
#include "wx/html/helpfrm.h"
#include "wx/html/helpctrl.h"
#include "wx/textctrl.h"
@@
-260,14
+265,14
@@
bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
wxMenu* fileMenu = new wxMenu;
fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
wxMenu* fileMenu = new wxMenu;
fileMenu->Append(wxID_HTML_OPENFILE, _("&Open..."));
- fileMenu->Append(wxID_ABOUT, _("&About..."));
fileMenu->AppendSeparator();
fileMenu->Append(wxID_CLOSE, _("&Close"));
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
SetMenuBar(menuBar);
#endif
@@
-1517,7
+1522,7
@@
void wxHtmlHelpFrame::OnCloseWindow(wxCloseEvent& evt)
}
#ifdef __WXMAC__
}
#ifdef __WXMAC__
-void wxHtmlHelpFrame::On
Quit
(wxCommandEvent& event)
+void wxHtmlHelpFrame::On
Close
(wxCommandEvent& event)
{
Close(TRUE);
}
{
Close(TRUE);
}
@@
-1545,7
+1550,7
@@
BEGIN_EVENT_TABLE(wxHtmlHelpFrame, wxFrame)
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
#ifdef __WXMAC__
EVT_COMBOBOX(wxID_HTML_BOOKMARKSLIST, wxHtmlHelpFrame::OnBookmarksSel)
EVT_CLOSE(wxHtmlHelpFrame::OnCloseWindow)
#ifdef __WXMAC__
- EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::On
Quit
)
+ EVT_MENU(wxID_CLOSE, wxHtmlHelpFrame::On
Close
)
EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
#endif
EVT_MENU(wxID_ABOUT, wxHtmlHelpFrame::OnAbout)
#endif