Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crashes fixed, trying to remove erradic redraws when layouting windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23448 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-09 15:48:52 +00:00
parent 882b047983
commit de923e4f50
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mac/carbon/control.cpp
View File

@@ -290,6 +290,7 @@ void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *contro
void wxRemoveMacControlAssociation(wxControl *control) void wxRemoveMacControlAssociation(wxControl *control)
{ {
if ( wxWinMacControlList )
wxWinMacControlList->DeleteObject(control); wxWinMacControlList->DeleteObject(control);
} }
@@ -346,7 +347,7 @@ void wxControl::MacPostControlCreate()
ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ; ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
::EmbedControl( (ControlHandle) m_macControl , container ) ; ::EmbedControl( (ControlHandle) m_macControl , container ) ;
m_macControlIsShown = true ; m_macControlIsShown = MacIsReallyShown() ;
wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ; wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
if ( wxMacSetupControlBackgroundUPP == NULL ) if ( wxMacSetupControlBackgroundUPP == NULL )
@@ -402,6 +403,7 @@ void wxControl::MacPostControlCreate()
UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) ) ; UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) ) ;
#endif #endif
if ( m_macControlIsShown )
UMAShowControl( (ControlHandle) m_macControl ) ; UMAShowControl( (ControlHandle) m_macControl ) ;
SetCursor( *wxSTANDARD_CURSOR ) ; SetCursor( *wxSTANDARD_CURSOR ) ;

4
src/mac/control.cpp
View File

@@ -290,6 +290,7 @@ void wxAssociateControlWithMacControl(ControlHandle inControl, wxControl *contro
void wxRemoveMacControlAssociation(wxControl *control) void wxRemoveMacControlAssociation(wxControl *control)
{ {
if ( wxWinMacControlList )
wxWinMacControlList->DeleteObject(control); wxWinMacControlList->DeleteObject(control);
} }
@@ -346,7 +347,7 @@ void wxControl::MacPostControlCreate()
ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ; ControlHandle container = (ControlHandle) GetParent()->MacGetContainerForEmbedding() ;
wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ;
::EmbedControl( (ControlHandle) m_macControl , container ) ; ::EmbedControl( (ControlHandle) m_macControl , container ) ;
m_macControlIsShown = true ; m_macControlIsShown = MacIsReallyShown() ;
wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ; wxAssociateControlWithMacControl( (ControlHandle) m_macControl , this ) ;
if ( wxMacSetupControlBackgroundUPP == NULL ) if ( wxMacSetupControlBackgroundUPP == NULL )
@@ -402,6 +403,7 @@ void wxControl::MacPostControlCreate()
UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) ) ; UMASetControlTitle( (ControlHandle) m_macControl , wxStripMenuCodes(m_label) ) ;
#endif #endif
if ( m_macControlIsShown )
UMAShowControl( (ControlHandle) m_macControl ) ; UMAShowControl( (ControlHandle) m_macControl ) ;
SetCursor( *wxSTANDARD_CURSOR ) ; SetCursor( *wxSTANDARD_CURSOR ) ;