From bca35e84c0a22af6567d260cfddef0a698858e3c Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Thu, 17 Dec 2009 14:41:57 +0000 Subject: [PATCH] Allow wxPropertyGrid::RecalculateVirtualSize() execute even if pg is not completely initialized (otherwise virtual size calculations may go wrong) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/propgrid/propgrid.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index b4bf6f8a39..6a05ec4948 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -4250,10 +4250,11 @@ bool wxPropertyGrid::DoHideProperty( wxPGProperty* p, bool hide, int flags ) void wxPropertyGrid::RecalculateVirtualSize( int forceXPos ) { + // Don't check for !HasInternalFlag(wxPG_FL_INITIALIZED) here. Otherwise + // virtual size calculation may go wrong. if ( HasInternalFlag(wxPG_FL_RECALCULATING_VIRTUAL_SIZE) || m_frozen || - !m_pState || - !HasInternalFlag(wxPG_FL_INITIALIZED) ) + !m_pState ) return; // -- 2.47.2