Fix broken and missing DataView interface items for Phoenix

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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index ac4d815131db7daf174258685e9fd3ef9f7c4f5f..957fb399722208075e6b8c6a505eb747420c3993 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -281,10 +281,6 @@ private:
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuItem, wxObject)
-

 BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupMenuWindow::OnKeyDown)
 
 BEGIN_EVENT_TABLE(wxPopupMenuWindow, wxPopupTransientWindow)
     EVT_KEY_DOWN(wxPopupMenuWindow::OnKeyDown)
 


@@ -360,7 +356,7 @@ void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
         if ( nodeOldCurrent )
         {
             wxMenuItem *item = nodeOldCurrent->GetData();
         if ( nodeOldCurrent )
         {
             wxMenuItem *item = nodeOldCurrent->GetData();

-            wxCHECK_RET( item, _T("no current item?") );
+            wxCHECK_RET( item, wxT("no current item?") );

 
             // if it was the currently opened menu, close it
             if ( item->IsSubMenu() && item->GetSubMenu()->IsShown() )
 
             // if it was the currently opened menu, close it
             if ( item->IsSubMenu() && item->GetSubMenu()->IsShown() )


@@ -432,7 +428,7 @@ void wxPopupMenuWindow::Popup(wxWindow *focus)
     // check that the current item had been properly reset before
     wxASSERT_MSG( !m_nodeCurrent ||
                   m_nodeCurrent == m_menu->GetMenuItems().GetFirst(),
     // check that the current item had been properly reset before
     wxASSERT_MSG( !m_nodeCurrent ||
                   m_nodeCurrent == m_menu->GetMenuItems().GetFirst(),

-                  _T("menu current item preselected incorrectly") );
+                  wxT("menu current item preselected incorrectly") );

 
     wxPopupTransientWindow::Popup(focus);
 
 
     wxPopupTransientWindow::Popup(focus);
 


@@ -451,13 +447,13 @@ void wxPopupMenuWindow::Popup(wxWindow *focus)
         wxPopupMenuWindow *win = menuParent->m_popupMenu;
 
         // if we're shown, the parent menu must be also shown
         wxPopupMenuWindow *win = menuParent->m_popupMenu;
 
         // if we're shown, the parent menu must be also shown

-        wxCHECK_RET( win, _T("parent menu is not shown?") );
+        wxCHECK_RET( win, wxT("parent menu is not shown?") );

 
         if ( !::SetWindowPos(GetHwndOf(win), GetHwnd(),
                              0, 0, 0, 0,
                              SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW) )
         {
 
         if ( !::SetWindowPos(GetHwndOf(win), GetHwnd(),
                              0, 0, 0, 0,
                              SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW) )
         {

-            wxLogLastError(_T("SetWindowPos(HWND_TOP)"));
+            wxLogLastError(wxT("SetWindowPos(HWND_TOP)"));

         }
 
         Refresh();
         }
 
         Refresh();


@@ -470,10 +466,10 @@ void wxPopupMenuWindow::Dismiss()
     if ( HasOpenSubmenu() )
     {
         wxMenuItem *item = GetCurrentItem();
     if ( HasOpenSubmenu() )
     {
         wxMenuItem *item = GetCurrentItem();

-        wxCHECK_RET( item && item->IsSubMenu(), _T("where is our open submenu?") );
+        wxCHECK_RET( item && item->IsSubMenu(), wxT("where is our open submenu?") );

 
         wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu;
 
         wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu;

-        wxCHECK_RET( win, _T("opened submenu is not opened?") );
+        wxCHECK_RET( win, wxT("opened submenu is not opened?") );

 
         win->Dismiss();
         OnSubmenuDismiss( false );
 
         win->Dismiss();
         OnSubmenuDismiss( false );


@@ -542,9 +538,9 @@ wxPopupMenuWindow::GetMenuItemFromPoint(const wxPoint& pt) const
 
 void wxPopupMenuWindow::RefreshItem(wxMenuItem *item)
 {
 
 void wxPopupMenuWindow::RefreshItem(wxMenuItem *item)
 {

-    wxCHECK_RET( item, _T("can't refresh NULL item") );
+    wxCHECK_RET( item, wxT("can't refresh NULL item") );

 
 

-    wxASSERT_MSG( IsShown(), _T("can't refresh menu which is not shown") );
+    wxASSERT_MSG( IsShown(), wxT("can't refresh menu which is not shown") );

 
     // FIXME: -1 here because of SetLogicalOrigin(1, 1) in DoDraw()
     RefreshRect(wxRect(0, item->GetPosition() - 1,
 
     // FIXME: -1 here because of SetLogicalOrigin(1, 1) in DoDraw()
     RefreshRect(wxRect(0, item->GetPosition() - 1,


@@ -606,7 +602,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
                 bmp = item->GetDisabledBitmap();
             }
 
                 bmp = item->GetDisabledBitmap();
             }
 

-            if ( !bmp.Ok() )
+            if ( !bmp.IsOk() )

             {
                 // strangely enough, for unchecked item we use the
                 // "checked" bitmap because this is the default one - this
             {
                 // strangely enough, for unchecked item we use the
                 // "checked" bitmap because this is the default one - this


@@ -637,10 +633,10 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
 
 void wxPopupMenuWindow::ClickItem(wxMenuItem *item)
 {
 
 void wxPopupMenuWindow::ClickItem(wxMenuItem *item)
 {

-    wxCHECK_RET( item, _T("can't click NULL item") );
+    wxCHECK_RET( item, wxT("can't click NULL item") );

 
     wxASSERT_MSG( !item->IsSeparator() && !item->IsSubMenu(),
 
     wxASSERT_MSG( !item->IsSeparator() && !item->IsSubMenu(),

-                  _T("can't click this item") );
+                  wxT("can't click this item") );

 
     wxMenu* menu = m_menu;
 
 
     wxMenu* menu = m_menu;
 


@@ -652,10 +648,10 @@ void wxPopupMenuWindow::ClickItem(wxMenuItem *item)
 
 void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how)
 {
 
 void wxPopupMenuWindow::OpenSubmenu(wxMenuItem *item, InputMethod how)
 {

-    wxCHECK_RET( item, _T("can't open NULL submenu") );
+    wxCHECK_RET( item, wxT("can't open NULL submenu") );

 
     wxMenu *submenu = item->GetSubMenu();
 
     wxMenu *submenu = item->GetSubMenu();

-    wxCHECK_RET( submenu, _T("can only open submenus!") );
+    wxCHECK_RET( submenu, wxT("can only open submenus!") );

 
     // FIXME: should take into account the border width
     submenu->Popup(ClientToScreen(wxPoint(0, item->GetPosition())),
 
     // FIXME: should take into account the border width
     submenu->Popup(ClientToScreen(wxPoint(0, item->GetPosition())),


@@ -710,7 +706,7 @@ bool wxPopupMenuWindow::ProcessLeftDown(wxMouseEvent& event)
         {
             wxPopupMenuWindow *win = menu->m_popupMenu;
 
         {
             wxPopupMenuWindow *win = menu->m_popupMenu;
 

-            wxCHECK_MSG( win, false, _T("parent menu not shown?") );
+            wxCHECK_MSG( win, false, wxT("parent menu not shown?") );

 
             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )
 
             pos = ClientToScreen(pos);
             if ( win->GetMenuItemFromPoint(win->ScreenToClient(pos)) )


@@ -799,7 +795,7 @@ void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
             wxPopupMenuWindow *win = menuParent->m_popupMenu;
 
             // if we're shown, the parent menu must be also shown
             wxPopupMenuWindow *win = menuParent->m_popupMenu;
 
             // if we're shown, the parent menu must be also shown

-            wxCHECK_RET( win, _T("parent menu is not shown?") );
+            wxCHECK_RET( win, wxT("parent menu is not shown?") );

 
             win->ProcessMouseMove(win->ScreenToClient(ptScreen));
         }
 
             win->ProcessMouseMove(win->ScreenToClient(ptScreen));
         }


@@ -834,10 +830,10 @@ void wxPopupMenuWindow::OnMouseLeave(wxMouseEvent& event)
         if ( HasOpenSubmenu() )
         {
             wxMenuItem *item = GetCurrentItem();
         if ( HasOpenSubmenu() )
         {
             wxMenuItem *item = GetCurrentItem();

-            wxCHECK_RET( CanOpen(item), _T("where is our open submenu?") );
+            wxCHECK_RET( CanOpen(item), wxT("where is our open submenu?") );

 
             wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu;
 
             wxPopupMenuWindow *win = item->GetSubMenu()->m_popupMenu;

-            wxCHECK_RET( win, _T("submenu is opened but not shown?") );
+            wxCHECK_RET( win, wxT("submenu is opened but not shown?") );

 
             // only handle this event if the mouse is not inside the submenu
             wxPoint pt = ClientToScreen(event.GetPosition());
 
             // only handle this event if the mouse is not inside the submenu
             wxPoint pt = ClientToScreen(event.GetPosition());


@@ -883,7 +879,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
     if ( HasOpenSubmenu() )
     {
         wxCHECK_MSG( CanOpen(item), false,
     if ( HasOpenSubmenu() )
     {
         wxCHECK_MSG( CanOpen(item), false,

-                     _T("has open submenu but another item selected?") );
+                     wxT("has open submenu but another item selected?") );

 
         if ( item->GetSubMenu()->ProcessKeyDown(key) )
             return true;
 
         if ( item->GetSubMenu()->ProcessKeyDown(key) )
             return true;


@@ -1087,7 +1083,7 @@ const wxMenuGeometryInfo& wxMenu::GetGeometryInfo() const
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG( _T("can't get geometry without window") );
+            wxFAIL_MSG( wxT("can't get geometry without window") );

         }
     }
 
         }
     }
 


@@ -1096,11 +1092,7 @@ const wxMenuGeometryInfo& wxMenu::GetGeometryInfo() const
 
 void wxMenu::InvalidateGeometryInfo()
 {
 
 void wxMenu::InvalidateGeometryInfo()
 {

-    if ( m_geometry )
-    {
-        delete m_geometry;
-        m_geometry = NULL;
-    }
+    wxDELETE(m_geometry);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1114,13 +1106,6 @@ void wxMenu::OnItemAdded(wxMenuItem *item)
 #if wxUSE_ACCEL
     AddAccelFor(item);
 #endif // wxUSE_ACCEL
 #if wxUSE_ACCEL
     AddAccelFor(item);
 #endif // wxUSE_ACCEL

-
-    // the submenus of a popup menu should have the same invoking window as it
-    // has
-    if ( m_invokingWindow && item->IsSubMenu() )
-    {
-        item->GetSubMenu()->SetInvokingWindow(m_invokingWindow);
-    }

 }
 
 void wxMenu::EndRadioGroup()
 }
 
 void wxMenu::EndRadioGroup()


@@ -1156,7 +1141,7 @@ wxMenuItem* wxMenu::DoAppend(wxMenuItem *item)
             }
             else
             {
             }
             else
             {

-                wxFAIL_MSG( _T("where is the radio group start item?") );
+                wxFAIL_MSG( wxT("where is the radio group start item?") );

             }
         }
     }
             }
         }
     }


@@ -1207,7 +1192,7 @@ void wxMenu::Attach(wxMenuBarBase *menubar)
 {
     wxMenuBase::Attach(menubar);
 
 {
     wxMenuBase::Attach(menubar);
 

-    wxCHECK_RET( m_menuBar, _T("menubar can't be NULL after attaching") );
+    wxCHECK_RET( m_menuBar, wxT("menubar can't be NULL after attaching") );

 
     // unfortunately, we can't use m_menuBar->GetEventHandler() here because,
     // if the menubar is currently showing a menu, its event handler is a
 
     // unfortunately, we can't use m_menuBar->GetEventHandler() here because,
     // if the menubar is currently showing a menu, its event handler is a


@@ -1222,6 +1207,10 @@ void wxMenu::Attach(wxMenuBarBase *menubar)
 
 void wxMenu::Detach()
 {
 
 void wxMenu::Detach()
 {

+    // After the menu is detached from the menu bar, it shouldn't send its
+    // events to it.
+    SetNextHandler(NULL);
+

     wxMenuBase::Detach();
 }
 
     wxMenuBase::Detach();
 }
 


@@ -1231,51 +1220,13 @@ void wxMenu::Detach()
 
 wxWindow *wxMenu::GetRootWindow() const
 {
 
 wxWindow *wxMenu::GetRootWindow() const
 {

-    if ( GetMenuBar() )
-    {
-        // simple case - a normal menu attached to the menubar
-        return GetMenuBar();
-    }
-
-    // we're a popup menu but the trouble is that only the top level popup menu
-    // has a pointer to the invoking window, so we must walk up the menu chain
-    // if needed
-    wxWindow *win = GetInvokingWindow();
-    if ( win )
-    {
-        // we already have it
-        return win;
-    }
-
-    wxMenu *menu = GetParent();
-    while ( menu )
-    {
-        // We are a submenu of a menu of a menubar
-        if (menu->GetMenuBar())
-           return menu->GetMenuBar();
-
-        win = menu->GetInvokingWindow();
-        if ( win )
-            break;
-
-        menu = menu->GetParent();
-    }
-
-    // we're probably going to crash in the caller anyhow, but try to detect
-    // this error as soon as possible
-    wxASSERT_MSG( win, _T("menu without any associated window?") );
-
-    // also remember it in this menu so that we don't have to search for it the
-    // next time
-    wxConstCast(this, wxMenu)->m_invokingWindow = win;
-
-    return win;
+    return GetMenuBar() ? GetMenuBar() : GetInvokingWindow();

 }
 
 wxRenderer *wxMenu::GetRenderer() const
 {
     // we're going to crash without renderer!
 }
 
 wxRenderer *wxMenu::GetRenderer() const
 {
     // we're going to crash without renderer!

-    wxCHECK_MSG( m_popupMenu, NULL, _T("neither popup nor menubar menu?") );
+    wxCHECK_MSG( m_popupMenu, NULL, wxT("neither popup nor menubar menu?") );

 
     return m_popupMenu->GetRenderer();
 }
 
     return m_popupMenu->GetRenderer();
 }


@@ -1288,7 +1239,7 @@ void wxMenu::RefreshItem(wxMenuItem *item)
     if ( IsShown() )
     {
         // this would be a bug in IsShown()
     if ( IsShown() )
     {
         // this would be a bug in IsShown()

-        wxCHECK_RET( m_popupMenu, _T("must have popup window if shown!") );
+        wxCHECK_RET( m_popupMenu, wxT("must have popup window if shown!") );

 
         // recalc geometry to update the item height and such
         (void)GetGeometryInfo();
 
         // recalc geometry to update the item height and such
         (void)GetGeometryInfo();


@@ -1318,7 +1269,7 @@ void wxMenu::OnDismiss(bool dismissParent)
         }
         else
         {
         }
         else
         {

-            wxFAIL_MSG( _T("parent menu not shown?") );
+            wxFAIL_MSG( wxT("parent menu not shown?") );

         }
 
         // and if we dismiss everything, propagate to parent
         }
 
         // and if we dismiss everything, propagate to parent


@@ -1338,12 +1289,10 @@ void wxMenu::OnDismiss(bool dismissParent)
         }
         else // popup menu
         {
         }
         else // popup menu
         {

-            wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") );
-
-            m_invokingWindow->DismissPopupMenu();
+            wxWindow * const win = GetInvokingWindow();
+            wxCHECK_RET( win, wxT("what kind of menu is this?") );

 
 

-            // Why reset it here? We need it for sending the event to...
-            // SetInvokingWindow(NULL);
+            win->DismissPopupMenu();

         }
     }
 }
         }
     }
 }


@@ -1373,7 +1322,7 @@ void wxMenu::Popup(const wxPoint& pos, const wxSize& size, bool selectFirst)
     // always keep the focus at the originating window
     wxWindow *focus = GetRootWindow();
 
     // always keep the focus at the originating window
     wxWindow *focus = GetRootWindow();
 

-    wxASSERT_MSG( focus, _T("no window to keep focus on?") );
+    wxASSERT_MSG( focus, wxT("no window to keep focus on?") );

 
     // and show it
     m_popupMenu->Popup(focus);
 
     // and show it
     m_popupMenu->Popup(focus);


@@ -1381,7 +1330,7 @@ void wxMenu::Popup(const wxPoint& pos, const wxSize& size, bool selectFirst)
 
 void wxMenu::Dismiss()
 {
 
 void wxMenu::Dismiss()
 {

-    wxCHECK_RET( IsShown(), _T("can't dismiss hidden menu") );
+    wxCHECK_RET( IsShown(), wxT("can't dismiss hidden menu") );

 
     m_popupMenu->Dismiss();
 }
 
     m_popupMenu->Dismiss();
 }


@@ -1393,7 +1342,7 @@ void wxMenu::Dismiss()
 bool wxMenu::ProcessKeyDown(int key)
 {
     wxCHECK_MSG( m_popupMenu, false,
 bool wxMenu::ProcessKeyDown(int key)
 {
     wxCHECK_MSG( m_popupMenu, false,

-                 _T("can't process key events if not shown") );
+                 wxT("can't process key events if not shown") );

 
     return m_popupMenu->ProcessKeyDown(key);
 }
 
     return m_popupMenu->ProcessKeyDown(key);
 }


@@ -1519,12 +1468,6 @@ wxMenuItem *wxMenuItemBase::New(wxMenu *parentMenu,
     return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
 }
 
     return new wxMenuItem(parentMenu, id, name, help, kind, subMenu);
 }
 

-/* static */
-wxString wxMenuItemBase::GetLabelText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-

 // ----------------------------------------------------------------------------
 // wxMenuItem operations
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenuItem operations
 // ----------------------------------------------------------------------------


@@ -1539,7 +1482,7 @@ void wxMenuItem::UpdateAccelInfo()
     m_indexAccel = wxControl::FindAccelIndex(m_text);
 
     // will be empty if the text contains no TABs - ok
     m_indexAccel = wxControl::FindAccelIndex(m_text);
 
     // will be empty if the text contains no TABs - ok

-    m_strAccel = m_text.AfterFirst(_T('\t'));
+    m_strAccel = m_text.AfterFirst(wxT('\t'));

 }
 
 void wxMenuItem::SetItemLabel(const wxString& text)
 }
 
 void wxMenuItem::SetItemLabel(const wxString& text)


@@ -1602,7 +1545,7 @@ void wxMenuItem::Check(bool check)
         const wxMenuItemList& items = m_parentMenu->GetMenuItems();
         int pos = items.IndexOf(this);
         wxCHECK_RET( pos != wxNOT_FOUND,
         const wxMenuItemList& items = m_parentMenu->GetMenuItems();
         int pos = items.IndexOf(this);
         wxCHECK_RET( pos != wxNOT_FOUND,

-                     _T("menuitem not found in the menu items list?") );
+                     wxT("menuitem not found in the menu items list?") );

 
         // get the radio group range
         int start,
 
         // get the radio group range
         int start,


@@ -1649,7 +1592,7 @@ void wxMenuItem::SetAsRadioGroupStart()
 void wxMenuItem::SetRadioGroupStart(int start)
 {
     wxASSERT_MSG( !m_isRadioGroupStart,
 void wxMenuItem::SetRadioGroupStart(int start)
 {
     wxASSERT_MSG( !m_isRadioGroupStart,

-                  _T("should only be called for the next radio items") );
+                  wxT("should only be called for the next radio items") );

 
     m_radioGroup.start = start;
 }
 
     m_radioGroup.start = start;
 }


@@ -1657,7 +1600,7 @@ void wxMenuItem::SetRadioGroupStart(int start)
 void wxMenuItem::SetRadioGroupEnd(int end)
 {
     wxASSERT_MSG( m_isRadioGroupStart,
 void wxMenuItem::SetRadioGroupEnd(int end)
 {
     wxASSERT_MSG( m_isRadioGroupStart,

-                  _T("should only be called for the first radio item") );
+                  wxT("should only be called for the first radio item") );

 
     m_radioGroup.end = end;
 }
 
     m_radioGroup.end = end;
 }


@@ -1688,7 +1631,7 @@ wxMenuBar::wxMenuBar(size_t n, wxMenu *menus[], const wxString titles[], long WX
 void wxMenuBar::Attach(wxFrame *frame)
 {
     // maybe you really wanted to call Detach()?
 void wxMenuBar::Attach(wxFrame *frame)
 {
     // maybe you really wanted to call Detach()?

-    wxCHECK_RET( frame, _T("wxMenuBar::Attach(NULL) called") );
+    wxCHECK_RET( frame, wxT("wxMenuBar::Attach(NULL) called") );

 
     wxMenuBarBase::Attach(frame);
 
 
     wxMenuBarBase::Attach(frame);
 


@@ -1806,7 +1749,7 @@ wxCoord wxMenuBar::GetItemWidth(size_t pos) const
 
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {
 
 void wxMenuBar::EnableTop(size_t pos, bool enable)
 {

-    wxCHECK_RET( pos < GetCount(), _T("invalid index in EnableTop") );
+    wxCHECK_RET( pos < GetCount(), wxT("invalid index in EnableTop") );

 
     if ( enable != m_menuInfos[pos].IsEnabled() )
     {
 
     if ( enable != m_menuInfos[pos].IsEnabled() )
     {


@@ -1819,14 +1762,14 @@ void wxMenuBar::EnableTop(size_t pos, bool enable)
 
 bool wxMenuBar::IsEnabledTop(size_t pos) const
 {
 
 bool wxMenuBar::IsEnabledTop(size_t pos) const
 {

-    wxCHECK_MSG( pos < GetCount(), false, _T("invalid index in IsEnabledTop") );
+    wxCHECK_MSG( pos < GetCount(), false, wxT("invalid index in IsEnabledTop") );

 
     return m_menuInfos[pos].IsEnabled();
 }
 
 void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
 {
 
     return m_menuInfos[pos].IsEnabled();
 }
 
 void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
 {

-    wxCHECK_RET( pos < GetCount(), _T("invalid index in SetMenuLabel") );
+    wxCHECK_RET( pos < GetCount(), wxT("invalid index in SetMenuLabel") );

 
     if ( label != m_menuInfos[pos].GetOriginalLabel() )
     {
 
     if ( label != m_menuInfos[pos].GetOriginalLabel() )
     {


@@ -1839,7 +1782,7 @@ void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)
 
 wxString wxMenuBar::GetMenuLabel(size_t pos) const
 {
 
 wxString wxMenuBar::GetMenuLabel(size_t pos) const
 {

-    wxCHECK_MSG( pos < GetCount(), wxEmptyString, _T("invalid index in GetMenuLabel") );
+    wxCHECK_MSG( pos < GetCount(), wxEmptyString, wxT("invalid index in GetMenuLabel") );

 
     return m_menuInfos[pos].GetOriginalLabel();
 }
 
     return m_menuInfos[pos].GetOriginalLabel();
 }


@@ -1864,7 +1807,7 @@ void wxMenuBar::RefreshAllItemsAfter(size_t pos)
 void wxMenuBar::RefreshItem(size_t pos)
 {
     wxCHECK_RET( pos != (size_t)-1,
 void wxMenuBar::RefreshItem(size_t pos)
 {
     wxCHECK_RET( pos != (size_t)-1,

-                 _T("invalid item in wxMenuBar::RefreshItem") );
+                 wxT("invalid item in wxMenuBar::RefreshItem") );

 
     if ( !IsCreated() )
     {
 
     if ( !IsCreated() )
     {


@@ -1939,8 +1882,8 @@ void wxMenuBar::DoDraw(wxControlRenderer *renderer)
 
 wxRect wxMenuBar::GetItemRect(size_t pos) const
 {
 
 wxRect wxMenuBar::GetItemRect(size_t pos) const
 {

-    wxASSERT_MSG( pos < GetCount(), _T("invalid menu bar item index") );
-    wxASSERT_MSG( IsCreated(), _T("can't call this method yet") );
+    wxASSERT_MSG( pos < GetCount(), wxT("invalid menu bar item index") );
+    wxASSERT_MSG( IsCreated(), wxT("can't call this method yet") );

 
     wxRect rect;
     rect.x =
 
     wxRect rect;
     rect.x =


@@ -2010,7 +1953,7 @@ int wxMenuBar::GetMenuFromPoint(const wxPoint& pos) const
 void wxMenuBar::SelectMenu(size_t pos)
 {
     SetFocus();
 void wxMenuBar::SelectMenu(size_t pos)
 {
     SetFocus();

-    wxLogTrace(_T("mousecapture"), _T("Capturing mouse from wxMenuBar::SelectMenu"));
+    wxLogTrace(wxT("mousecapture"), wxT("Capturing mouse from wxMenuBar::SelectMenu"));

     CaptureMouse();
 
     DoSelectMenu(pos);
     CaptureMouse();
 
     DoSelectMenu(pos);


@@ -2018,7 +1961,7 @@ void wxMenuBar::SelectMenu(size_t pos)
 
 void wxMenuBar::DoSelectMenu(size_t pos)
 {
 
 void wxMenuBar::DoSelectMenu(size_t pos)
 {

-    wxCHECK_RET( pos < GetCount(), _T("invalid menu index in DoSelectMenu") );
+    wxCHECK_RET( pos < GetCount(), wxT("invalid menu index in DoSelectMenu") );

 
     int posOld = m_current;
 
 
     int posOld = m_current;
 


@@ -2046,7 +1989,7 @@ void wxMenuBar::DoSelectMenu(size_t pos)
 
 void wxMenuBar::PopupMenu(size_t pos)
 {
 
 void wxMenuBar::PopupMenu(size_t pos)
 {

-    wxCHECK_RET( pos < GetCount(), _T("invalid menu index in PopupCurrentMenu") );
+    wxCHECK_RET( pos < GetCount(), wxT("invalid menu index in PopupCurrentMenu") );

 
     SetFocus();
     DoSelectMenu(pos);
 
     SetFocus();
     DoSelectMenu(pos);


@@ -2099,7 +2042,7 @@ void wxMenuBar::OnLeftDown(wxMouseEvent& event)
         }
         else // on item
         {
         }
         else // on item
         {

-            wxLogTrace(_T("mousecapture"), _T("Capturing mouse from wxMenuBar::OnLeftDown"));
+            wxLogTrace(wxT("mousecapture"), wxT("Capturing mouse from wxMenuBar::OnLeftDown"));

             CaptureMouse();
 
             // show it as selected
             CaptureMouse();
 
             // show it as selected


@@ -2174,7 +2117,7 @@ void wxMenuBar::OnKeyDown(wxKeyEvent& event)
         {
             // we always maintain a valid current item while we're in modal
             // state (i.e. have the capture)
         {
             // we always maintain a valid current item while we're in modal
             // state (i.e. have the capture)

-            wxFAIL_MSG( _T("how did we manage to lose current item?") );
+            wxFAIL_MSG( wxT("how did we manage to lose current item?") );

 
             return;
         }
 
             return;
         }


@@ -2405,10 +2348,10 @@ bool wxMenuBar::ProcessAccelEvent(const wxKeyEvent& event)
 
 void wxMenuBar::PopupCurrentMenu(bool selectFirst)
 {
 
 void wxMenuBar::PopupCurrentMenu(bool selectFirst)
 {

-    wxCHECK_RET( m_current != -1, _T("no menu to popup") );
+    wxCHECK_RET( m_current != -1, wxT("no menu to popup") );

 
     // forgot to call DismissMenu()?
 
     // forgot to call DismissMenu()?

-    wxASSERT_MSG( !m_menuShown, _T("shouldn't show two menus at once!") );
+    wxASSERT_MSG( !m_menuShown, wxT("shouldn't show two menus at once!") );

 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = true;
 
     // in any case, we should show it - even if we won't
     m_shouldShowMenu = true;


@@ -2426,8 +2369,6 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);
 
             // item, not to the right of it
             wxRect rectItem = GetItemRect(m_current);
 

-            m_menuShown->SetInvokingWindow(m_frameLast);
-

             m_menuShown->Popup(ClientToScreen(rectItem.GetPosition()),
                                wxSize(0, rectItem.GetHeight()),
                                selectFirst);
             m_menuShown->Popup(ClientToScreen(rectItem.GetPosition()),
                                wxSize(0, rectItem.GetHeight()),
                                selectFirst);


@@ -2443,7 +2384,7 @@ void wxMenuBar::PopupCurrentMenu(bool selectFirst)
 
 void wxMenuBar::DismissMenu()
 {
 
 void wxMenuBar::DismissMenu()
 {

-    wxCHECK_RET( m_menuShown, _T("can't dismiss menu if none is shown") );
+    wxCHECK_RET( m_menuShown, wxT("can't dismiss menu if none is shown") );

 
     m_menuShown->Dismiss();
     OnDismissMenu();
 
     m_menuShown->Dismiss();
     OnDismissMenu();


@@ -2462,7 +2403,9 @@ void wxMenuBar::OnDismissMenu(bool dismissMenuBar)
 void wxMenuBar::OnDismiss()
 {
     if ( ReleaseMouseCapture() )
 void wxMenuBar::OnDismiss()
 {
     if ( ReleaseMouseCapture() )

-        wxLogTrace(_T("mousecapture"), _T("Releasing mouse from wxMenuBar::OnDismiss"));
+    {
+        wxLogTrace(wxT("mousecapture"), wxT("Releasing mouse from wxMenuBar::OnDismiss"));
+    }

 
     if ( m_current != -1 )
     {
 
     if ( m_current != -1 )
     {


@@ -2525,7 +2468,7 @@ wxEventLoop *wxWindow::ms_evtLoopPopup = NULL;
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     wxCHECK_MSG( !ms_evtLoopPopup, false,
 bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 {
     wxCHECK_MSG( !ms_evtLoopPopup, false,

-                 _T("can't show more than one popup menu at a time") );
+                 wxT("can't show more than one popup menu at a time") );

 
 #ifdef __WXMSW__
     // we need to change the cursor before showing the menu as, apparently, no
 
 #ifdef __WXMSW__
     // we need to change the cursor before showing the menu as, apparently, no


@@ -2550,10 +2493,6 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     Update();
 #endif // 0
 
     Update();
 #endif // 0
 

-    menu->SetInvokingWindow(this);
-
-    // wxLogDebug( "Name of invoking window %s", menu->GetInvokingWindow()->GetName().c_str() );
-

     menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0));
 
     // this is not very useful if the menu was popped up because of the mouse
     menu->Popup(ClientToScreen(wxPoint(x, y)), wxSize(0,0));
 
     // this is not very useful if the menu was popped up because of the mouse


@@ -2570,14 +2509,11 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
     ms_evtLoopPopup = new wxEventLoop;
     ms_evtLoopPopup->Run();
 
     ms_evtLoopPopup = new wxEventLoop;
     ms_evtLoopPopup->Run();
 

-    delete ms_evtLoopPopup;
-    ms_evtLoopPopup = NULL;
+    wxDELETE(ms_evtLoopPopup);

 
     // remove the handler
     PopEventHandler(true /* delete it */);
 
 
     // remove the handler
     PopEventHandler(true /* delete it */);
 

-    menu->SetInvokingWindow(NULL);
-

 #ifdef __WXMSW__
     SetCursor(cursorOld);
 #endif // __WXMSW__
 #ifdef __WXMSW__
     SetCursor(cursorOld);
 #endif // __WXMSW__


@@ -2587,7 +2523,7 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)
 
 void wxWindow::DismissPopupMenu()
 {
 
 void wxWindow::DismissPopupMenu()
 {

-    wxCHECK_RET( ms_evtLoopPopup, _T("no popup menu shown") );
+    wxCHECK_RET( ms_evtLoopPopup, wxT("no popup menu shown") );

 
     ms_evtLoopPopup->Exit();
 }
 
     ms_evtLoopPopup->Exit();
 }