fixing osx_cocoa

[wxWidgets.git] / src / msw / mdi.cpp

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index 9bcee0a86a490debc6a81af0e4e2e4430b6ae44d..6dbb49ea1ade739da71d948e336386e4e008525c 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -369,8 +369,7 @@ void wxMDIParentFrame::SetWindowMenu(wxMenu* menu)
     }
 
 #if wxUSE_ACCEL
     }
 
 #if wxUSE_ACCEL

-    delete m_accelWindowMenu;
-    m_accelWindowMenu = NULL;
+    wxDELETE(m_accelWindowMenu);

 
     if ( menu && menu->HasAccels() )
         m_accelWindowMenu = menu->CreateAccelTable();
 
     if ( menu && menu->HasAccels() )
         m_accelWindowMenu = menu->CreateAccelTable();


@@ -686,7 +685,7 @@ bool wxMDIParentFrame::TryBefore(wxEvent& event)
     if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
     {
         wxMDIChildFrame * const child = GetActiveChild();
     if ( event.GetEventType() == wxEVT_COMMAND_MENU_SELECTED )
     {
         wxMDIChildFrame * const child = GetActiveChild();

-        if ( child && child->ProcessEventHere(event) )
+        if ( child && child->ProcessWindowEventLocally(event) )

             return true;
     }
 
             return true;
     }
 


@@ -1112,7 +1111,7 @@ bool wxMDIChildFrame::HandleMDIActivate(long WXUNUSED(activate),
 
         WXHMENU hMenuParent = parent->m_hMenu;
 
 
         WXHMENU hMenuParent = parent->m_hMenu;
 

-        // activate the the parent menu only when there is no other child
+        // activate the parent menu only when there is no other child

         // that has been activated
         if ( hMenuParent && !hwndAct )
             hMenuToSet = hMenuParent;
         // that has been activated
         if ( hMenuParent && !hwndAct )
             hMenuToSet = hMenuParent;