Fix for PCH-less compilation of wxRibbonXmlHandler.

[wxWidgets.git] / src / xrc / xh_menu.cpp

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 217b155c024c82097429ab871de3c5c17d1f0614..275c78aa622a705593753aab5f4f79a2bdbacbf5 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -21,6 +21,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
+    #include "wx/log.h"
     #include "wx/menu.h"
 #endif
 
@@ -88,7 +89,15 @@ 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 )
+                {
+                    ReportParamError
+                    (
+                        "checkable",
+                        "menu item can't have both <radio> and <checkable> properties"
+                    );
+                }
+
                 kind = wxITEM_CHECK;
             }
 
@@ -97,7 +106,17 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 
 #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));
@@ -129,7 +148,17 @@ wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 
 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
-    wxMenuBar *menubar = new wxMenuBar(GetStyle());
+    wxMenuBar *menubar = NULL;
+
+    const int style = GetStyle();
+    wxASSERT_MSG(!style || !m_instance,
+                 "cannot use <style> with pre-created menubar");
+
+    if ( m_instance )
+        menubar = wxDynamicCast(m_instance, wxMenuBar);
+    if ( !menubar )
+        menubar = new wxMenuBar(style);
+
     CreateChildren(menubar);
 
     if (m_parentAsWindow)