minor fix to wxDC::SetClippingRegion

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index a7935f8018c5d8dc9f793a5d03139c06d96f3718..bfa9ed1644115a56362e904d24186e7bc642a524 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -27,11 +27,9 @@
 wxMenuXmlHandler::wxMenuXmlHandler() : 
         wxXmlResourceHandler(), m_insideMenu(FALSE)
 {
-    ADD_STYLE(wxMENU_TEAROFF);
+    XRC_ADD_STYLE(wxMENU_TEAROFF);
 }
 
-
-
 wxObject *wxMenuXmlHandler::DoCreateResource()
 {
     if (m_class == wxT("wxMenu"))
@@ -71,7 +69,7 @@ wxObject *wxMenuXmlHandler::DoCreateResource()
             int id = GetID();
             bool checkable = GetBool(wxT("checkable"));
             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;
@@ -103,16 +101,11 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
            );
 }
 
-
-
-
 wxMenuBarXmlHandler::wxMenuBarXmlHandler() : wxXmlResourceHandler()
 {
-    ADD_STYLE(wxMB_DOCKABLE);
+    XRC_ADD_STYLE(wxMB_DOCKABLE);
 }
 
-
-
 wxObject *wxMenuBarXmlHandler::DoCreateResource()
 {
     wxMenuBar *menubar = new wxMenuBar(GetStyle());
@@ -134,4 +127,3 @@ bool wxMenuBarXmlHandler::CanHandle(wxXmlNode *node)
 {
     return IsOfClass(node, wxT("wxMenuBar"));
 }
-