added radio menu items ot XRC

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

diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp
index bfa9ed1644115a56362e904d24186e7bc642a524..4ff9112e1df087e60b13ac89989529aae8da519d 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -65,17 +65,25 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/

-        {
+        {          

             int id = GetID();
             int id = GetID();

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

             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), FALSE);
             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;
 
             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), FALSE);
             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);
+                                               GetText(wxT("help")), kind);

                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                 if (HasParam(wxT("bitmap")))
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                 if (HasParam(wxT("bitmap")))


@@ -83,7 +91,8 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));

-            if (checkable) mitem->Check(GetBool(wxT("checked")));
+            if (kind == wxITEM_CHECK)
+                mitem->Check(GetBool(wxT("checked")));

         }
         return NULL;
     }
         }
         return NULL;
     }

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index bfa9ed1644115a56362e904d24186e7bc642a524..4ff9112e1df087e60b13ac89989529aae8da519d 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -65,17 +65,25 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/
         else if (m_class == wxT("break"))
             p_menu->Break();
         else /*wxMenuItem*/

-        {
+        {          

             int id = GetID();
             int id = GetID();

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

             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), FALSE);
             wxString fullLabel = label;
             if (!accel.IsEmpty())
                 fullLabel << wxT("\t") << accel;
 
             wxString label = GetText(wxT("label"));
             wxString accel = GetText(wxT("accel"), FALSE);
             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);
+                                               GetText(wxT("help")), kind);

                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                 if (HasParam(wxT("bitmap")))
                                                
 #if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
                 if (HasParam(wxT("bitmap")))


@@ -83,7 +91,8 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));
 #endif
             p_menu->Append(mitem);
             mitem->Enable(GetBool(wxT("enabled"), TRUE));

-            if (checkable) mitem->Check(GetBool(wxT("checked")));
+            if (kind == wxITEM_CHECK)
+                mitem->Check(GetBool(wxT("checked")));

         }
         return NULL;
     }
         }
         return NULL;
     }