updates from Adrián González Alba

[wxWidgets.git] / src / mac / carbon / window.cpp

diff --git a/src/mac/carbon/window.cpp b/src/mac/carbon/window.cpp
index 253dbf49a85acc0591e13ef4d3672bc9a8f000ba..09dfc658d60c7001f09dae6eaebf5414a80388dc 100644 (file)
--- a/src/mac/carbon/window.cpp
+++ b/src/mac/carbon/window.cpp
@@ -30,12 +30,12 @@
     #include "wx/statbox.h"
     #include "wx/textctrl.h"
     #include "wx/toolbar.h"
+    #include "wx/layout.h"
+    #include "wx/statusbr.h"
+    #include "wx/menuitem.h"
 #endif
 
-#include "wx/layout.h"
 #include "wx/tooltip.h"
-#include "wx/statusbr.h"
-#include "wx/menuitem.h"
 #include "wx/spinctrl.h"
 #include "wx/geometry.h"
 
@@ -993,11 +993,11 @@ wxWindowMac::~wxWindowMac()
     // wxRemoveMacControlAssociation( this ) ;
     // If we delete an item, we should initialize the parent panel,
     // because it could now be invalid.
-    wxWindow *parent = GetParent() ;
-    if ( parent )
+    wxTopLevelWindow *tlw = wxDynamicCast(wxGetTopLevelParent(this), wxTopLevelWindow);
+    if ( tlw )
     {
-        if (parent->GetDefaultItem() == (wxButton*) this)
-            parent->SetDefaultItem(NULL);
+        if ( tlw->GetDefaultItem() == (wxButton*) this)
+            tlw->SetDefaultItem(NULL);
     }
 
     if ( m_peer && m_peer->Ok() )
@@ -1136,7 +1136,7 @@ void wxWindowMac::MacPostControlCreate(const wxPoint& pos, const wxSize& size)
     // adjust font, controlsize etc
     DoSetWindowVariant( m_windowVariant ) ;
 
-    m_peer->SetLabel( wxStripMenuCodes(m_label) ) ;
+    m_peer->SetLabel( wxStripMenuCodes(m_label, wxStrip_Mnemonics) ) ;
 
     if (!m_macIsUserPane)
         SetInitialBestSize(size);
@@ -2088,7 +2088,7 @@ void wxWindowMac::DoSetClientSize(int clientwidth, int clientheight)
 
 void wxWindowMac::SetLabel(const wxString& title)
 {
-    m_label = wxStripMenuCodes(title) ;
+    m_label = wxStripMenuCodes(title, wxStrip_Mnemonics) ;
 
     if ( m_peer && m_peer->Ok() )
         m_peer->SetLabel( m_label ) ;