set SMALL_FONT for controls here because InheritAttributes() doesn't do it any longer

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

diff --git a/contrib/src/xrc/xh_menu.cpp b/contrib/src/xrc/xh_menu.cpp
index a7935f8018c5d8dc9f793a5d03139c06d96f3718..5df0d5f8d5f779f47feffcd6b7097b285838fde6 100644 (file)
--- a/contrib/src/xrc/xh_menu.cpp
+++ b/contrib/src/xrc/xh_menu.cpp
@@ -23,15 +23,14 @@
 #include "wx/menu.h"
 #include "wx/frame.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"))


@@ -67,25 +66,34 @@ 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 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);
+                                               GetText(wxT("help")), kind);

                                                
                                                

-#if wxCHECK_VERSION(2,3,0) || defined(__WXMSW__)
-                if (HasParam(wxT("bitmap")))
-                    mitem->SetBitmap(GetBitmap(wxT("bitmap")));
+#if wxCHECK_VERSION(2,3,0) || (defined(__WXMSW__) && wxUSE_OWNER_DRAWN)
+            if (HasParam(wxT("bitmap")))
+                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));

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

         }
         return NULL;
     }
         }
         return NULL;
     }


@@ -103,16 +111,13 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
            );
 }
 
            );
 }
 

-
-
+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());
 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
     wxMenuBar *menubar = new wxMenuBar(GetStyle());


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

-