added bitmaps to menu items

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

diff --git a/contrib/src/xml/xh_menu.cpp b/contrib/src/xml/xh_menu.cpp
index 900b05b8748661e55f2f2d91e5448a2cba570d4c..bb3693da5ba8be3aa93feeae24646eeec64e3643 100644 (file)
--- a/contrib/src/xml/xh_menu.cpp
+++ b/contrib/src/xml/xh_menu.cpp
@@ -65,16 +65,25 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             p_menu->AppendSeparator();
         else if (m_Node->GetName() == _T("break"))
             p_menu->Break();
             p_menu->AppendSeparator();
         else if (m_Node->GetName() == _T("break"))
             p_menu->Break();

-        else
+        else /*menuitem*/

         {
             int id = GetID();
             bool checkable = GetBool(_T("checkable"));
         {
             int id = GetID();
             bool checkable = GetBool(_T("checkable"));

+

             p_menu->Append(id, GetText(_T("label")), 
                            GetText(_T("help")), checkable);
             if (id != -1)
             {
                 p_menu->Enable(id, GetBool(_T("enabled"), TRUE));
                 if (checkable) p_menu->Check(id, GetBool(_T("checked")));
             p_menu->Append(id, GetText(_T("label")), 
                            GetText(_T("help")), checkable);
             if (id != -1)
             {
                 p_menu->Enable(id, GetBool(_T("enabled"), TRUE));
                 if (checkable) p_menu->Check(id, GetBool(_T("checked")));

+                
+#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
+                if (HasParam(_T("bitmap")))
+                {
+                    wxMenuItem *mitem = p_menu->FindItem(id);
+                    mitem->SetBitmap(GetBitmap(_T("bitmap")));
+                }
+#endif

             }
         }
         return NULL;
             }
         }
         return NULL;