From 804889b1fcaee7a53f038a130bca97e51fcfee03 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 18 Dec 2013 18:01:05 +0000 Subject: [PATCH] GridCtrl: Insert/AddColumn = NULL changed to zero string to avoid crashing git-svn-id: svn://ultimatepp.org/upp/trunk@6670 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/GridCtrl/GridCtrl.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/GridCtrl/GridCtrl.h b/uppsrc/GridCtrl/GridCtrl.h index b86420faa..37d5e8189 100644 --- a/uppsrc/GridCtrl/GridCtrl.h +++ b/uppsrc/GridCtrl/GridCtrl.h @@ -1233,10 +1233,10 @@ class GridCtrl : public Ctrl /* Methods */ - ItemRect& InsertColumn(int pos, const char *name = NULL, int size = -1, bool idx = false); - ItemRect& AddColumn(const Id id, const char *name = NULL, int size = -1, bool idx = false); + ItemRect& InsertColumn(int pos, const char *name = "", int size = -1, bool idx = false); + ItemRect& AddColumn(const Id id, const char *name = "", int size = -1, bool idx = false); ItemRect& AddColumn(const String& name, int size = -1, bool idx = false); - ItemRect& AddColumn(const char *name = NULL, int size = -1, bool idx = false); + ItemRect& AddColumn(const char *name = "", int size = -1, bool idx = false); void RemoveColumn(int n, int count = 1);