Add support for stretchable spaces to wxToolBar.

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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 80023293d8314af45d79022ca1b4c637a1f5d665..eaf34b8f9e79b531bf368c26d2a557aa05aa3fc9 100644 (file)
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -25,19 +25,21 @@
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

+#include "wx/menu.h"
+#include "wx/stockitem.h"
+

 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/control.h"      // for FindAccelIndex()
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
     #include "wx/control.h"      // for FindAccelIndex()

-    #include "wx/menu.h"

     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"
     #include "wx/frame.h"
     #include "wx/settings.h"
     #include "wx/accel.h"
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/dcclient.h"

 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"
 #endif // WX_PRECOMP
 
 #include "wx/popupwin.h"
 #include "wx/evtloop.h"

-#include "wx/dcclient.h"

 
 #include "wx/univ/renderer.h"
 
 
 #include "wx/univ/renderer.h"
 


@@ -65,6 +67,8 @@ public:
 
     void SetLabel(const wxString& text)
     {
 
     void SetLabel(const wxString& text)
     {

+        m_originalLabel = text;
+

         // remember the accel char (may be -1 if none)
         m_indexAccel = wxControl::FindAccelIndex(text, &m_label);
 
         // remember the accel char (may be -1 if none)
         m_indexAccel = wxControl::FindAccelIndex(text, &m_label);
 


@@ -77,6 +81,7 @@ public:
     // accessors
 
     const wxString& GetLabel() const { return m_label; }
     // accessors
 
     const wxString& GetLabel() const { return m_label; }

+    const wxString& GetOriginalLabel() const { return m_originalLabel; }

     bool IsEnabled() const { return m_isEnabled; }
     wxCoord GetWidth(wxMenuBar *menubar) const
     {
     bool IsEnabled() const { return m_isEnabled; }
     wxCoord GetWidth(wxMenuBar *menubar) const
     {


@@ -103,6 +108,7 @@ private:
     }
 
     wxString m_label;
     }
 
     wxString m_label;

+    wxString m_originalLabel;

     wxCoord m_width;
     int m_indexAccel;
     bool m_isEnabled;
     wxCoord m_width;
     int m_indexAccel;
     bool m_isEnabled;


@@ -121,7 +127,7 @@ class wxPopupMenuWindow : public wxPopupTransientWindow
 public:
     wxPopupMenuWindow(wxWindow *parent, wxMenu *menu);
 
 public:
     wxPopupMenuWindow(wxWindow *parent, wxMenu *menu);
 

-    ~wxPopupMenuWindow();
+    virtual ~wxPopupMenuWindow();

 
     // override the base class version to select the first item initially
     virtual void Popup(wxWindow *focus = NULL);
 
     // override the base class version to select the first item initially
     virtual void Popup(wxWindow *focus = NULL);


@@ -345,7 +351,7 @@ void wxPopupMenuWindow::SetCurrentItem(wxMenuItemIter node)
 
 void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
 {
 
 void wxPopupMenuWindow::ChangeCurrent(wxMenuItemIter node)
 {

-    if ( node != m_nodeCurrent )
+    if ( !m_nodeCurrent || !node || (node != m_nodeCurrent) )

     {
         wxMenuItemIter nodeOldCurrent = m_nodeCurrent;
 
     {
         wxMenuItemIter nodeOldCurrent = m_nodeCurrent;
 


@@ -354,7 +360,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() )


@@ -426,7 +432,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);
 


@@ -445,13 +451,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();


@@ -464,10 +470,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 );


@@ -536,9 +542,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,


@@ -613,7 +619,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
                      dc,
                      y,
                      gi,
                      dc,
                      y,
                      gi,

-                     item->GetLabel(),
+                     item->GetItemLabelText(),

                      item->GetAccelString(),
                      bmp,
                      flags,
                      item->GetAccelString(),
                      bmp,
                      flags,


@@ -631,10 +637,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;
 


@@ -646,10 +652,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())),


@@ -704,7 +710,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)) )


@@ -761,7 +767,7 @@ void wxPopupMenuWindow::ProcessMouseMove(const wxPoint& pt)
     // the window (see below)
     if ( node )
     {
     // the window (see below)
     if ( node )
     {

-        if ( node != m_nodeCurrent )
+        if ( !m_nodeCurrent || (node != m_nodeCurrent) )

         {
             ChangeCurrent(node);
 
         {
             ChangeCurrent(node);
 


@@ -793,7 +799,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));
         }


@@ -828,10 +834,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());


@@ -877,7 +883,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;


@@ -986,7 +992,7 @@ bool wxPopupMenuWindow::ProcessKeyDown(int key)
 
                     int idxAccel = item->GetAccelIndex();
                     if ( idxAccel != -1 &&
 
                     int idxAccel = item->GetAccelIndex();
                     if ( idxAccel != -1 &&

-                         wxTolower(item->GetLabel()[(size_t)idxAccel])
+                         (wxChar)wxTolower(item->GetItemLabelText()[(size_t)idxAccel])

                             == chAccel )
                     {
                         // ok, found an item with this accel
                             == chAccel )
                     {
                         // ok, found an item with this accel


@@ -1081,7 +1087,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") );

         }
     }
 
         }
     }
 


@@ -1150,7 +1156,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?") );

             }
         }
     }
             }
         }
     }


@@ -1201,7 +1207,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


@@ -1257,7 +1263,7 @@ wxWindow *wxMenu::GetRootWindow() const
 
     // we're probably going to crash in the caller anyhow, but try to detect
     // this error as soon as possible
 
     // 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?") );
+    wxASSERT_MSG( win, wxT("menu without any associated window?") );

 
     // also remember it in this menu so that we don't have to search for it the
     // next time
 
     // also remember it in this menu so that we don't have to search for it the
     // next time


@@ -1269,7 +1275,7 @@ wxWindow *wxMenu::GetRootWindow() const
 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();
 }


@@ -1282,7 +1288,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();


@@ -1312,7 +1318,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


@@ -1332,7 +1338,7 @@ void wxMenu::OnDismiss(bool dismissParent)
         }
         else // popup menu
         {
         }
         else // popup menu
         {

-            wxCHECK_RET( m_invokingWindow, _T("what kind of menu is this?") );
+            wxCHECK_RET( m_invokingWindow, wxT("what kind of menu is this?") );

 
             m_invokingWindow->DismissPopupMenu();
 
 
             m_invokingWindow->DismissPopupMenu();
 


@@ -1367,7 +1373,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);


@@ -1375,7 +1381,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();
 }


@@ -1387,7 +1393,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);
 }


@@ -1513,12 +1519,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::GetLabelFromText(const wxString& text)
-{
-    return wxStripMenuCodes(text);
-}
-

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


@@ -1533,15 +1533,16 @@ 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::SetText(const wxString& text)
+void wxMenuItem::SetItemLabel(const wxString& text)

 {
     if ( text != m_text )
     {
         // first call the base class version to change m_text
 {
     if ( text != m_text )
     {
         // first call the base class version to change m_text

-        wxMenuItemBase::SetText(text);
+        // (and also check if we don't have a stock menu item)
+        wxMenuItemBase::SetItemLabel(text);

 
         UpdateAccelInfo();
 
 
         UpdateAccelInfo();
 


@@ -1595,7 +1596,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,


@@ -1642,7 +1643,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;
 }


@@ -1650,7 +1651,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;
 }


@@ -1681,7 +1682,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);
 


@@ -1799,7 +1800,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() )
     {


@@ -1812,16 +1813,16 @@ 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();
 }
 
 
     return m_menuInfos[pos].IsEnabled();
 }
 

-void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
+void wxMenuBar::SetMenuLabel(size_t pos, const wxString& label)

 {
 {

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

 
 

-    if ( label != m_menuInfos[pos].GetLabel() )
+    if ( label != m_menuInfos[pos].GetOriginalLabel() )

     {
         m_menuInfos[pos].SetLabel(label);
 
     {
         m_menuInfos[pos].SetLabel(label);
 


@@ -1830,11 +1831,11 @@ void wxMenuBar::SetLabelTop(size_t pos, const wxString& label)
     //else: nothing to do
 }
 
     //else: nothing to do
 }
 

-wxString wxMenuBar::GetLabelTop(size_t pos) const
+wxString wxMenuBar::GetMenuLabel(size_t pos) const

 {
 {

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

 
 

-    return m_menuInfos[pos].GetLabel();
+    return m_menuInfos[pos].GetOriginalLabel();

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


@@ -1857,7 +1858,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() )
     {


@@ -1932,8 +1933,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 =


@@ -1957,7 +1958,7 @@ wxSize wxMenuBar::DoGetBestClientSize() const
     {
         wxClientDC dc(wxConstCast(this, wxMenuBar));
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
     {
         wxClientDC dc(wxConstCast(this, wxMenuBar));
         dc.SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));

-        dc.GetTextExtent(GetLabelTop(0), &size.x, &size.y);
+        dc.GetTextExtent(GetMenuLabel(0), &size.x, &size.y);

 
         // adjust for the renderer we use
         size = GetRenderer()->GetMenuBarItemSize(size);
 
         // adjust for the renderer we use
         size = GetRenderer()->GetMenuBarItemSize(size);


@@ -2003,7 +2004,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);


@@ -2011,7 +2012,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;
 


@@ -2039,7 +2040,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);


@@ -2092,7 +2093,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


@@ -2167,7 +2168,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;
         }


@@ -2327,8 +2328,7 @@ int wxMenuBar::FindNextItemForAccel(int idxStart, int key, bool *unique) const
 
         int idxAccel = info.GetAccelIndex();
         if ( idxAccel != -1 &&
 
         int idxAccel = info.GetAccelIndex();
         if ( idxAccel != -1 &&

-             wxTolower(info.GetLabel()[(size_t)idxAccel])
-                == chAccel )
+             (wxChar)wxTolower(info.GetLabel()[(size_t)idxAccel]) == chAccel )

         {
             // ok, found an item with this accel
             if ( idxFound == -1 )
         {
             // ok, found an item with this accel
             if ( idxFound == -1 )


@@ -2399,10 +2399,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;


@@ -2437,7 +2437,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();


@@ -2456,7 +2456,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 )
     {


@@ -2519,7 +2521,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


@@ -2581,7 +2583,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();
 }