fixing osx_carbon

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 47e5494d7c2d2a4d012b263d50e121340df9df97..275c78aa622a705593753aab5f4f79a2bdbacbf5 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -15,16 +15,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_XRC
+#if wxUSE_XRC && wxUSE_MENUS

 
 #include "wx/xrc/xh_menu.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"
 
 #include "wx/xrc/xh_menu.h"
 
 #ifndef WX_PRECOMP
     #include "wx/frame.h"

+    #include "wx/log.h"
+    #include "wx/menu.h"

 #endif
 
 #endif
 

-#include "wx/menu.h"
-

 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
 wxMenuXmlHandler::wxMenuXmlHandler() :
 IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)
 
 wxMenuXmlHandler::wxMenuXmlHandler() :


@@ -37,7 +37,9 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))
     {
 {
     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"));
 
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));
 


@@ -87,7 +89,15 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
                 kind = wxITEM_RADIO;
             if (GetBool(wxT("checkable")))
             {
                 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;
             }
 
                 kind = wxITEM_CHECK;
             }
 


@@ -96,7 +106,17 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 
 #if (!defined(__WXMSW__) && !defined(__WXPM__)) || wxUSE_OWNER_DRAWN
             if (HasParam(wxT("bitmap")))
 
 #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));
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), true));


@@ -128,7 +148,17 @@ wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 
 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
 
 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)
     CreateChildren(menubar);
 
     if (m_parentAsWindow)


@@ -148,4 +178,4 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 
     return IsOfClass(node, wxT("wxMenuBar"));
 }
 

-#endif // wxUSE_XRC
+#endif // wxUSE_XRC && wxUSE_MENUS