added <accel> attribute to wxMenuItem

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10025 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/contrib/src/xml/xh_menu.cpp b/contrib/src/xml/xh_menu.cpp
index 05506006901c6750bf2106a186158171250289d7..0b42642ed461bd50739bae6095e6c3c25fd4ca2b 100644 (file)
--- a/contrib/src/xml/xh_menu.cpp
+++ b/contrib/src/xml/xh_menu.cpp
@@ -38,7 +38,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         wxMenu *menu = new wxMenu(GetStyle());
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));
-    
+        
         bool oldins = m_insideMenu;
         m_insideMenu = TRUE;
         CreateChildren(menu, TRUE/*only this handler*/);
@@ -69,8 +69,13 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         {
             int id = GetID();
             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, GetText(wxT("label")),
+            wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), checkable);
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)

diff --git a/contrib/utils/wxrcedit/df/wxMenuItem.df b/contrib/utils/wxrcedit/df/wxMenuItem.df
index 387bf851a5d1e59af5e59f1ca21234c629b3ae66..242c48cf1b240f387b6765bb8dfe5fb37d7227f5 100644 (file)
--- a/contrib/utils/wxrcedit/df/wxMenuItem.df
+++ b/contrib/utils/wxrcedit/df/wxMenuItem.df
@@ -2,6 +2,7 @@ node wxMenuItem
 type normal
 icon 0
 var label of text
+var accel of text
 var help of text
 var checkable of bool
 var checked of bool