code cleanup for the pen width condition (patch 1034942 + more)

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 86a27e88f73885b100b65a3019be7292e4eec6c8..c23acf06aa6f640f72442e2c0af83996d91f7567 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_menu.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        xh_menu.cpp

-// Purpose:     XML resource for menus and menubars
+// Purpose:     XRC resource for menus and menubars

 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

- 
+

 #ifdef __GNUG__
 #pragma implementation "xh_menu.h"
 #endif
 #ifdef __GNUG__
 #pragma implementation "xh_menu.h"
 #endif


@@ -19,18 +19,20 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#if wxUSE_XRC
+

 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"

+#include "wx/frame.h"

 
 

+IMPLEMENT_DYNAMIC_CLASS(wxMenuXmlHandler, wxXmlResourceHandler)

 
 

-wxMenuXmlHandler::wxMenuXmlHandler() : 
-        wxXmlResourceHandler(), m_insideMenu(FALSE)
+wxMenuXmlHandler::wxMenuXmlHandler() :
+        wxXmlResourceHandler(), m_insideMenu(false)

 {
 {

-    ADD_STYLE(wxMENU_TEAROFF);
+    XRC_ADD_STYLE(wxMENU_TEAROFF);

 }
 
 }
 

-
-

 wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))
 wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))


@@ -38,10 +40,10 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         wxMenu *menu = new wxMenu(GetStyle());
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));
         wxMenu *menu = new wxMenu(GetStyle());
         wxString title = GetText(wxT("label"));
         wxString help = GetText(wxT("help"));

-        
+

         bool oldins = m_insideMenu;
         bool oldins = m_insideMenu;

-        m_insideMenu = TRUE;
-        CreateChildren(menu, TRUE/*only this handler*/);
+        m_insideMenu = true;
+        CreateChildren(menu, true/*only this handler*/);

         m_insideMenu = oldins;
 
         wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);
         m_insideMenu = oldins;
 
         wxMenuBar *p_bar = wxDynamicCast(m_parent, wxMenuBar);


@@ -60,7 +62,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
     else
     {
         wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);
     else
     {
         wxMenu *p_menu = wxDynamicCast(m_parent, wxMenu);

-        
+

         if (m_class == wxT("separator"))
             p_menu->AppendSeparator();
         else if (m_class == wxT("break"))
         if (m_class == wxT("separator"))
             p_menu->AppendSeparator();
         else if (m_class == wxT("break"))


@@ -68,23 +70,32 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         else /*wxMenuItem*/
         {
             int id = GetID();
         else /*wxMenuItem*/
         {
             int id = GetID();

-            bool checkable = GetBool(wxT("checkable"));

             wxString label = GetText(wxT("label"));
             wxString label = GetText(wxT("label"));

-            wxString accel = GetText(wxT("accel"));
+            wxString accel = GetText(wxT("accel"), false);

             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;
 
             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;
 

+            wxItemKind kind = wxITEM_NORMAL;
+            if (GetBool(wxT("radio")))
+                kind = wxITEM_RADIO;
+            if (GetBool(wxT("checkable")))
+            {
+                wxASSERT_MSG( kind == wxITEM_NORMAL, _T("can't have both checkable and radion button at once") );
+                kind = wxITEM_CHECK;
+            }
+

             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,
             wxMenuItem *mitem = new wxMenuItem(p_menu, id, fullLabel,

-                                               GetText(wxT("help")), checkable);
-                                               
-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-                if (HasParam(wxT("bitmap")))
-                    mitem->SetBitmap(GetBitmap(wxT("bitmap")));
+                                               GetText(wxT("help")), kind);
+
+#if wxUSE_OWNER_DRAWN
+            if (HasParam(wxT("bitmap")))
+                mitem->SetBitmap(GetBitmap(wxT("bitmap"), wxART_MENU));

 #endif
             p_menu->Append(mitem);
 #endif
             p_menu->Append(mitem);

-            mitem->Enable(GetBool(wxT("enabled"), TRUE));
-            if (checkable) mitem->Check(GetBool(wxT("checked")));
+            mitem->Enable(GetBool(wxT("enabled"), true));
+            if (kind == wxITEM_CHECK)
+                mitem->Check(GetBool(wxT("checked")));

         }
         return NULL;
     }
         }
         return NULL;
     }


@@ -95,34 +106,32 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenu")) ||
 bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenu")) ||

-           (m_insideMenu && 
+           (m_insideMenu &&

                (IsOfClass(node, wxT("wxMenuItem")) ||
                 IsOfClass(node, wxT("break")) ||
                 IsOfClass(node, wxT("separator")))
            );
 }
 
                (IsOfClass(node, wxT("wxMenuItem")) ||
                 IsOfClass(node, wxT("break")) ||
                 IsOfClass(node, wxT("separator")))
            );
 }
 

-
-
-
-
-
-
-
-
-
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBarXmlHandler, wxXmlResourceHandler)

 
 wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 {
 
 wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 {

-    ADD_STYLE(wxMB_DOCKABLE);
+    XRC_ADD_STYLE(wxMB_DOCKABLE);

 }
 
 }
 

-
-

 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
     wxMenuBar *menubar = new wxMenuBar(GetStyle());
     CreateChildren(menubar);
 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
     wxMenuBar *menubar = new wxMenuBar(GetStyle());
     CreateChildren(menubar);

+
+    if (m_parentAsWindow)
+    {
+        wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
+        if (parentFrame)
+            parentFrame->SetMenuBar(menubar);
+    }
+

     return menubar;
 }
 
     return menubar;
 }
 


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

+#endif // wxUSE_XRC