X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/916533c0dc8c44e5f060cb1d8e0746e9e96e5ab8..ae901b234c4a0aa7c1777b3bd181dd7f8517ad21:/src/propgrid/propgrid.cpp

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index b6758f21eb..f33e2c7119 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -63,8 +63,6 @@
 
 #include "wx/timer.h"
 #include "wx/dcbuffer.h"
-#include "wx/clipbrd.h"
-#include "wx/dataobj.h"
 
 #ifdef __WXMSW__
     #include "wx/msw/private.h"
@@ -1040,7 +1038,7 @@ bool wxPropertyGrid::SetFont( const wxFont& font )
     ClearSelection(false);
 
     bool res = wxScrolledWindow::SetFont( font );
-    if ( res )
+    if ( res && GetParent()) // may not have been Create()ed yet
     {
         CalculateFontAndBitmapStuff( m_vspacing );
         Refresh();