X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88a2dafd7070b973234998cc8b2ddb4d1f0977d8..9d8c2f419f522408a922277df330d4c4511befb9:/contrib/src/xml/xh_menu.cpp

diff --git a/contrib/src/xml/xh_menu.cpp b/contrib/src/xml/xh_menu.cpp
index 906e675a5d..0b42642ed4 100644
--- a/contrib/src/xml/xh_menu.cpp
+++ b/contrib/src/xml/xh_menu.cpp
@@ -24,7 +24,7 @@
 
 
 wxMenuXmlHandler::wxMenuXmlHandler() : 
-        wxXmlResourceHandler(), m_InsideMenu(FALSE)
+        wxXmlResourceHandler(), m_insideMenu(FALSE)
 {
     ADD_STYLE(wxMENU_TEAROFF);
 }
@@ -33,23 +33,23 @@ wxMenuXmlHandler::wxMenuXmlHandler() :
 
 wxObject *wxMenuXmlHandler::DoCreateResource()
 {
-    if (m_Class == _T("wxMenu"))
+    if (m_class == wxT("wxMenu"))
     {
         wxMenu *menu = new wxMenu(GetStyle());
-        wxString title = GetText(_T("label"));
-        wxString help = GetText(_T("help"));
-    
-        bool oldins = m_InsideMenu;
-        m_InsideMenu = TRUE;
+        wxString title = GetText(wxT("label"));
+        wxString help = GetText(wxT("help"));
+        
+        bool oldins = m_insideMenu;
+        m_insideMenu = TRUE;
         CreateChildren(menu, TRUE/*only this handler*/);
-        m_InsideMenu = oldins;
+        m_insideMenu = oldins;
 
-        wxMenuBar *p_bar = wxDynamicCast(m_Parent, wxMenuBar);
+        wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
         if (p_bar)
             p_bar->Append(menu, title);
         else
         {
-            wxMenu *p_menu = wxDynamicCast(m_Parent, wxMenu);
+            wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
             if (p_menu)
                 p_menu->Append(GetID(), title, menu, help);
         }
@@ -59,27 +59,32 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 
     else
     {
-        wxMenu *p_menu = wxDynamicCast(m_Parent, wxMenu);
+        wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
         
-        if (m_Class == _T("separator"))
+        if (m_class == wxT("separator"))
             p_menu->AppendSeparator();
-        else if (m_Class == _T("break"))
+        else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/
         {
             int id = GetID();
-            bool checkable = GetBool(_T("checkable"));
-
-            wxMenuItem *mitem = new wxMenuItem(p_menu, id, GetText(_T("label")),
-                                               GetText(_T("help")), checkable);
+            bool checkable = GetBool(wxT("checkable"));
+            wxString label = GetText(wxT("label"));
+            wxString accel = GetText(wxT("accel"));
+            wxString fullLabel = label;
+            if (!accel.IsEmpty())
+                fullLabel << wxT("\t") << accel;
+
+            wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
+                                               GetText(wxT("help")), checkable);
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-                if (HasParam(_T("bitmap")))
-                    mitem->SetBitmap(GetBitmap(_T("bitmap")));
+                if (HasParam(wxT("bitmap")))
+                    mitem->SetBitmap(GetBitmap(wxT("bitmap")));
 #endif
             p_menu->Append(mitem);
-            mitem->Enable(GetBool(_T("enabled"), TRUE));
-            if (checkable) mitem->Check(GetBool(_T("checked")));
+            mitem->Enable(GetBool(wxT("enabled"), TRUE));
+            if (checkable) mitem->Check(GetBool(wxT("checked")));
         }
         return NULL;
     }
@@ -89,11 +94,11 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 
 bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return IsOfClass(node, _T("wxMenu")) ||
-           (m_InsideMenu && 
-               (IsOfClass(node, _T("wxMenuItem")) ||
-                IsOfClass(node, _T("break")) ||
-                IsOfClass(node, _T("separator")))
+    return IsOfClass(node, wxT("wxMenu")) ||
+           (m_insideMenu && 
+               (IsOfClass(node, wxT("wxMenuItem")) ||
+                IsOfClass(node, wxT("break")) ||
+                IsOfClass(node, wxT("separator")))
            );
 }
 
@@ -125,6 +130,6 @@ wxObject *wxMenuBarXmlHandler::DoCreateResource()
 
 bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
 {
-    return IsOfClass(node, _T("wxMenuBar"));
+    return IsOfClass(node, wxT("wxMenuBar"));
 }