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

Avoid infinite recursion on Mac in comboctrl, and fix an uninitialized pointer in propgrid

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69005 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-09-05 20:08:04 +00:00
parent 76b92fa5c7
commit 4f8870e337
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/combocmn.cpp
View File

@@ -2034,6 +2034,8 @@ void wxComboCtrlBase::OnCharEvent(wxKeyEvent& event)
void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event ) void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
{ {
// On Mac, this leads to infinite recursion and eventually a crash
#ifndef __WXMAC__
if ( event.GetEventType() == wxEVT_SET_FOCUS ) if ( event.GetEventType() == wxEVT_SET_FOCUS )
{ {
wxWindow* tc = GetTextCtrl(); wxWindow* tc = GetTextCtrl();
@@ -2044,6 +2046,7 @@ void wxComboCtrlBase::OnFocusEvent( wxFocusEvent& event )
} }
Refresh(); Refresh();
#endif
} }
void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) ) void wxComboCtrlBase::OnIdleEvent( wxIdleEvent& WXUNUSED(event) )

1
src/propgrid/propgrid.cpp
View File

@@ -6227,6 +6227,7 @@ void wxPropertyGridEvent::Init()
m_column = 1; m_column = 1;
m_canVeto = false; m_canVeto = false;
m_wasVetoed = false; m_wasVetoed = false;
m_pg = NULL;
} }
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------