From: Jaakko Salli Date: Wed, 16 Dec 2009 18:48:42 +0000 (+0000) Subject: Slightly improved check whether or not to execute wxPropertyGrid::RecalculateVirtualS... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1bc74ec9b7b5adae3455170c4cea89610da00f75 Slightly improved check whether or not to execute wxPropertyGrid::RecalculateVirtualSize() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index c11f78d36f..b4bf6f8a39 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -4250,9 +4250,10 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags ) void wxPropertyGrid::RecalculateVirtualSize( int forceXPos ) { - if ( (m_iFlags & wxPG_FL_RECALCULATING_VIRTUAL_SIZE) || + if ( HasInternalFlag(wxPG_FL_RECALCULATING_VIRTUAL_SIZE) || m_frozen || - !m_pState ) + !m_pState || + !HasInternalFlag(wxPG_FL_INITIALIZED) ) return; //