X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93cf77c076b699e8e0b3b0049bd4f80de15997dd..520e470fdd0daef09c77938db642e4583933c90d:/src/stubs/menu.cpp diff --git a/src/stubs/menu.cpp b/src/stubs/menu.cpp index 217e6c8b88..be4e10eba7 100644 --- a/src/stubs/menu.cpp +++ b/src/stubs/menu.cpp @@ -25,6 +25,7 @@ #include "wx/menu.h" #include "wx/menuitem.h" #include "wx/log.h" +#include "wx/utils.h" // other standard headers // ---------------------- @@ -180,7 +181,7 @@ void wxMenu::SetTitle(const wxString& label) // TODO } -const wxString& wxMenu::GetTitle() const +const wxString wxMenu::GetTitle() const { return m_title; } @@ -293,11 +294,12 @@ void wxMenu::ProcessCommand(wxCommandEvent & event) { processed = GetEventHandler()->ProcessEvent(event); } - +/* TODO // Try the window the menu was popped up from (and up // through the hierarchy) if ( !processed && GetInvokingWindow()) processed = GetInvokingWindow()->ProcessEvent(event); +*/ } bool wxWindow::PopupMenu(wxMenu *menu, int x, int y) @@ -318,7 +320,7 @@ wxMenuBar::wxMenuBar() // TODO } -wxMenuBar::wxMenuBar(int n, wxMenu *Mmnus[], const wxString titles[]) +wxMenuBar::wxMenuBar(int n, wxMenu *menus[], const wxString titles[]) { m_eventHandler = this; m_menuCount = n; @@ -560,7 +562,7 @@ wxString wxMenuBar::GetHelpString (int Id) const for (i = 0; i < m_menuCount; i++) { if (m_menus[i]->FindItemForId (Id)) - eturn wxString(m_menus[i]->GetHelpString (Id)); + return wxString(m_menus[i]->GetHelpString (Id)); } return wxString(""); }