fix preprocessor expression, closes #12822

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index f836539c69c2230f7dc555d84fbe134edd9a0d31..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
 
@@ -90,9 +91,11 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             {
                 if ( kind != wxITEM_NORMAL )
                 {
-                    wxLogWarning(_("XRC syntax error: a menu item can't have "
-                                   "both \"radio\" and \"checkable\" "
-                                   "properties, ignoring the former."));
+                    ReportParamError
+                    (
+                        "checkable",
+                        "menu item can't have both <radio> and <checkable> properties"
+                    );
                 }
 
                 kind = wxITEM_CHECK;
@@ -145,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)