X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/621be1ec2672d922cfb95d6e8178b38c8ceaf52a..302c73511a6819c5a56269ba95cb18eb11e994f0:/src/xrc/xh_menu.cpp

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 1f473c6dee..fe700cdd5c 100644
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        xh_menu.cpp
+// Name:        src/xrc/xh_menu.cpp
 // Purpose:     XRC resource for menus and menubars
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
@@ -8,10 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "xh_menu.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -19,11 +15,15 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_MENUS
 
 #include "wx/xrc/xh_menu.h"
-#include "wx/menu.h"
-#include "wx/frame.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/frame.h"
+    #include "wx/log.h"
+    #include "wx/menu.h"
+#endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
@@ -37,7 +37,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))
     {
-        wxMenu *menu = new wxMenu(GetStyle());
+        wxMenu *menu = m_instance ? wxStaticCast(m_instance, wxMenu)
+                                  : new wxMenu(GetStyle());
+
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));
 
@@ -48,12 +50,18 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 
         wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
         if (p_bar)
+        {
             p_bar->Append(menu, title);
+        }
         else
         {
             wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
             if (p_menu)
+            {
                 p_menu->Append(GetID(), title, menu, help);
+                if (HasParam(wxT("enabled")))
+                    p_menu->Enable(GetID(), GetBool(wxT("enabled")));
+            }
         }
 
         return menu;
@@ -73,7 +81,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), false);
             wxString fullLabel = label;
-            if (!accel.IsEmpty())
+            if (!accel.empty())
                 fullLabel << wxT("\t") << accel;
 
             wxItemKind kind = wxITEM_NORMAL;
@@ -81,16 +89,32 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
                 kind = wxITEM_RADIO;
             if (GetBool(wxT("checkable")))
             {
-                wxASSERT_MSG( kind == wxITEM_NORMAL, _T("can't have both checkable and radion button at once") );
+                if ( kind != wxITEM_NORMAL )
+                {
+                    wxLogWarning(_("XRC syntax error: a menu item can't have "
+                                   "both \"radio\" and \"checkable\" "
+                                   "properties, ignoring the former."));
+                }
+
                 kind = wxITEM_CHECK;
             }
 
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
 
-#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
+#if (!defined(__WXMSW__) && !defined(__WXPM__)) || wxUSE_OWNER_DRAWN
             if (HasParam(wxT("bitmap")))
-                mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
+            {
+                // currently only wxMSW has support for using different checked
+                // and unchecked bitmaps for menu items
+#ifdef __WXMSW__
+                if (HasParam(wxT("bitmap2")))
+                    mitem->SetBitmaps(GetBitmap(wxT("bitmap2"), wxART_MENU),
+                                      GetBitmap(wxT("bitmap"), wxART_MENU));
+                else
+#endif // __WXMSW__
+                    mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
+            }
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), true));
@@ -142,4 +166,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_MENUS