no message

[wxWidgets.git] / src / stubs / menu.cpp

diff --git a/src/stubs/menu.cpp b/src/stubs/menu.cpp
index 217e6c8b888b75e3f6ba539032c76e2ff9deaebd..be4e10eba7163df8b0009a4c95ba234c1ce58b90 100644 (file)
--- 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/menu.h"
 #include "wx/menuitem.h"
 #include "wx/log.h"

+#include "wx/utils.h"

 
 // other standard headers
 // ----------------------
 
 // other standard headers
 // ----------------------


@@ -180,7 +181,7 @@ void wxMenu::SetTitle(const wxString& label)
     // TODO
 }
 
     // TODO
 }
 

-const wxString& wxMenu::GetTitle() const
+const wxString wxMenu::GetTitle() const

 {
     return m_title;
 }
 {
     return m_title;
 }


@@ -293,11 +294,12 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
     {
             processed = GetEventHandler()->ProcessEvent(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);
     // 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)
 }
 
 bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)


@@ -318,7 +320,7 @@ wxMenuBar::wxMenuBar()
     // TODO
 }
 
     // 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;
 {
     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))
     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("");
 }
     }
     return wxString("");
 }