A little different fix for how to delay the call to __wxCleanup

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

diff --git a/src/xrc/xh_menu.cpp b/src/xrc/xh_menu.cpp
index 709f4e23810cb18d2a75fc1da55ef5a8f4fe6de2..93d93e08921e10f0e29ccd3036d43745e037ef67 100644 (file)
--- a/src/xrc/xh_menu.cpp
+++ b/src/xrc/xh_menu.cpp
@@ -21,16 +21,15 @@
 
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"
 
 #include "wx/xrc/xh_menu.h"
 #include "wx/menu.h"

+#include "wx/frame.h"

 
 
 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"))


@@ -102,27 +101,23 @@ bool wxMenuXmlHandler::CanHandle(wxXmlNode *node)
            );
 }
 
            );
 }
 

-
-
-
-
-
-
-
-
-
-

 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;
 }
 


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

-