XRC ignored menu bitmap on non-MSW platforms, fixed

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index c23acf06aa6f640f72442e2c0af83996d91f7567..e439e69d6605014363d68f880c96d5826fcb18d2 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -88,7 +88,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
 
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
                                                GetText(wxT("help")), kind);
 

-#if wxUSE_OWNER_DRAWN
+#if !defined(__WXMSW__) || wxUSE_OWNER_DRAWN

             if (HasParam(wxT("bitmap")))
                 mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif
             if (HasParam(wxT("bitmap")))
                 mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));
 #endif