diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 40621bef89..d85dfe678d 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -1542,7 +1542,9 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) key == WXK_DELETE || key == WXK_BACK) { + long t1 = 0xDEADBEEF ; wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + long t2 = 0xDEADBEEF ; event1.SetString( GetValue() ) ; event1.SetEventObject( this ); wxPostEvent(GetEventHandler(),event1); @@ -1570,7 +1572,10 @@ bool wxTextCtrl::Show(bool show) bool retval = wxControl::Show( show ) ; - if ( former != m_macControlIsShown ) + WindowRef window = (WindowRef) MacGetRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + + if ( former != m_macControlIsShown && win!=NULL && !win->IsBeingDeleted() ) { if ( m_macControlIsShown ) TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left, diff --git a/src/mac/textctrl.cpp b/src/mac/textctrl.cpp index 40621bef89..d85dfe678d 100644 --- a/src/mac/textctrl.cpp +++ b/src/mac/textctrl.cpp @@ -1542,7 +1542,9 @@ void wxTextCtrl::OnChar(wxKeyEvent& event) key == WXK_DELETE || key == WXK_BACK) { + long t1 = 0xDEADBEEF ; wxCommandEvent event1(wxEVT_COMMAND_TEXT_UPDATED, m_windowId); + long t2 = 0xDEADBEEF ; event1.SetString( GetValue() ) ; event1.SetEventObject( this ); wxPostEvent(GetEventHandler(),event1); @@ -1570,7 +1572,10 @@ bool wxTextCtrl::Show(bool show) bool retval = wxControl::Show( show ) ; - if ( former != m_macControlIsShown ) + WindowRef window = (WindowRef) MacGetRootWindow() ; + wxWindowMac* win = wxFindWinFromMacWindow( window ) ; + + if ( former != m_macControlIsShown && win!=NULL && !win->IsBeingDeleted() ) { if ( m_macControlIsShown ) TXNSetFrameBounds( (TXNObject) m_macTXN, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.top, (**(STPTextPaneVars **)m_macTXNvars).fRTextArea.left,