X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63e2147c8b027645682e0e4cd013a3f30bbd3483..0cdd4e199e078e34076b7f28ea65be81ffb7960c:/include/wx/generic/grid.h?ds=sidebyside

diff --git a/include/wx/generic/grid.h b/include/wx/generic/grid.h
index 612eefeaaa..7c4de9a29f 100644
--- a/include/wx/generic/grid.h
+++ b/include/wx/generic/grid.h
@@ -696,6 +696,7 @@ public:
     bool HasEditor() const { return m_editor != NULL; }
     bool HasReadWriteMode() const { return m_isReadOnly != Unset; }
     bool HasOverflowMode() const { return m_overflow != UnsetOverflow; }
+    bool HasSize() const { return m_sizeRows != 1 || m_sizeCols != 1; }
 
     const wxColour& GetTextColour() const;
     const wxColour& GetBackgroundColour() const;
@@ -713,6 +714,14 @@ public:
 
     void SetDefAttr(wxGridCellAttr* defAttr) { m_defGridAttr = defAttr; }
 
+protected:
+    // the dtor is private because only DecRef() can delete us
+    virtual ~wxGridCellAttr()
+    {
+        wxSafeDecRef(m_renderer);
+        wxSafeDecRef(m_editor);
+    }
+
 private:
     enum wxAttrReadMode
     {
@@ -731,12 +740,6 @@ private:
     // the common part of all ctors
     void Init(wxGridCellAttr *attrDefault = NULL);
 
-    // the dtor is private because only DecRef() can delete us
-    ~wxGridCellAttr()
-    {
-        wxSafeDecRef(m_renderer);
-        wxSafeDecRef(m_editor);
-    }
 
     // the ref count - when it goes to 0, we die
     size_t   m_nRef;