diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index eb6cace662..bf138adb68 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -1931,7 +1931,11 @@ protected:
     unsigned char       m_mouseSide;
 
     /** True when editor control is focused. */
+#if WXWIN_COMPATIBILITY_3_0
     unsigned char       m_editorFocused;
+#else
+    bool                m_editorFocused;
+#endif
 
     /** 1 if m_latsCaption is also the bottommost caption. */
     //unsigned char       m_lastCaptionBottomnest;
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 8375f9621b..4a1e92ee62 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -370,7 +370,7 @@ void wxPropertyGrid::Init1()
     m_permanentValidationFailureBehavior = wxPG_VFB_DEFAULT;
     m_dragStatus = 0;
     m_mouseSide = 16;
-    m_editorFocused = 0;
+    m_editorFocused = false;
 
     // Set up default unspecified value 'colour'
     m_unspecifiedAppearance.SetFgCol(*wxLIGHT_GREY);
@@ -4092,7 +4092,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
     if ( IsFrozen() )
     {
         m_iFlags &= ~(wxPG_FL_ABNORMAL_EDITOR);
-        m_editorFocused = 0;
+        m_editorFocused = false;
         m_pState->DoSetSelection(p);
 
         // If frozen, always free controls. But don't worry, as Thaw will
@@ -4117,7 +4117,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
                     if ( m_wndEditor )
                     {
                         m_wndEditor->SetFocus();
-                        m_editorFocused = 1;
+                        m_editorFocused = true;
                     }
                 }
                 else
@@ -4173,7 +4173,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
             int propY = p->GetY2(m_lineHeight);
 
             int splitterX = GetSplitterPosition();
-            m_editorFocused = 0;
+            m_editorFocused = false;
             m_iFlags |= wxPG_FL_PRIMARY_FILLS_ENTIRE;
 
             wxASSERT( m_wndEditor == NULL );
@@ -4307,7 +4307,7 @@ bool wxPropertyGrid::DoSelectProperty( wxPGProperty* p, unsigned int flags )
                 }
 
                 if ( flags & wxPG_SEL_FOCUS )
-                    m_editorFocused = 1;
+                    m_editorFocused = true;
 
             }
             else
@@ -4724,7 +4724,7 @@ void wxPropertyGrid::SetFocusOnCanvas()
         }
     }
 
-    m_editorFocused = 0;
+    m_editorFocused = false;
 }
 
 // -----------------------------------------------------------------------
@@ -5285,7 +5285,7 @@ bool wxPropertyGrid::HandleMouseUp( int x, unsigned int WXUNUSED(y),
     #endif
 
         // This clears the focus.
-        m_editorFocused = 0;
+        m_editorFocused = false;
 
     }
     return res;