From 6988758648aedab9465c65b228546ad931041926 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 2 Sep 2016 10:33:00 -0700
Subject: [PATCH] Add missing methods in wxGridCellAttr

---
 interface/wx/grid.h | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/interface/wx/grid.h b/interface/wx/grid.h
index a250db796f..c363027bc0 100644
--- a/interface/wx/grid.h
+++ b/interface/wx/grid.h
@@ -801,7 +801,10 @@ public:
         Row,
 
         /// Return the attribute set for this cells column.
-        Col
+        Col,
+
+        Default,
+        Merged
     };
 
     /**
@@ -978,6 +981,22 @@ public:
     */
     void SetTextColour(const wxColour& colText);
 
+    
+    void MergeWith(wxGridCellAttr *mergefrom);
+
+    void SetSize(int num_rows, int num_cols);
+    void SetOverflow(bool allow = true);
+    void SetKind(wxAttrKind kind);
+
+    bool HasReadWriteMode() const;
+    bool HasOverflowMode() const;
+    bool HasSize() const;
+
+    void GetSize(int *num_rows, int *num_cols) const;
+    bool GetOverflow() const;
+    wxAttrKind GetKind();
+
+
 protected:
 
     /**