Allow wxPropertyGrid::RecalculateVirtualSize() execute even if pg is not completely...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62912 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index b4bf6f8a39dddb01871ebd0297ad2d53ddfdaab8..6a05ec4948c124db1238ebad259effa9f3f3008b 100644 (file)
--- 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 )
 {
 
 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 ||
     if ( HasInternalFlag(wxPG_FL_RECALCULATING_VIRTUAL_SIZE) ||
          m_frozen ||

-         !m_pState ||
-         !HasInternalFlag(wxPG_FL_INITIALIZED) )
+         !m_pState )

         return;
 
     //
         return;
 
     //