github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

GridCtrl: Replaced NULL with ""

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6736 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2014-01-08 17:55:08 +00:00
parent 3670abbb4d
commit ce5c296996
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/GridCtrl/GridCtrl.cpp
View file

@ -1865,7 +1865,7 @@ void GridCtrl::SetColCount(int n, int size)
{
Reset();
for(int i = 0; i < n; i++)
AddColumn(NULL, size, false);
AddColumn("", size, false);
}
void GridCtrl::MouseMove(Point p, dword keyflags)

12
uppsrc/GridCtrl/GridCtrl.h
View file

@ -787,11 +787,11 @@ class GridCtrl : public Ctrl
ItemRect& Skip(bool b) { skip = b; return *this; }
ItemRect& DoAvg(const char *s = NULL) { sop = SOP_AVG; sopfrm = s; return *this; }
ItemRect& DoSum(const char *s = NULL) { sop = SOP_SUM; sopfrm = s; return *this; }
ItemRect& DoMin(const char *s = NULL) { sop = SOP_MIN; sopfrm = s; return *this; }
ItemRect& DoMax(const char *s = NULL) { sop = SOP_MAX; sopfrm = s; return *this; }
ItemRect& DoCount(const char *s = NULL) { sop = SOP_CNT; sopfrm = s; return *this; }
ItemRect& DoAvg(const char *s = "") { sop = SOP_AVG; sopfrm = s; return *this; }
ItemRect& DoSum(const char *s = "") { sop = SOP_SUM; sopfrm = s; return *this; }
ItemRect& DoMin(const char *s = "") { sop = SOP_MIN; sopfrm = s; return *this; }
ItemRect& DoMax(const char *s = "") { sop = SOP_MAX; sopfrm = s; return *this; }
ItemRect& DoCount(const char *s = "") { sop = SOP_CNT; sopfrm = s; return *this; }
int GetId() { return id; }
int GetNumber() { return id - parent->fixed_cols; }
@ -1244,7 +1244,7 @@ class GridCtrl : public Ctrl
ItemRect& AddHiddenColumn(const char *name) { return AddColumn(name, 0); }
ItemRect& AddHiddenColumn(String &name) { return AddColumn(name, 0); }
ItemRect& AddIndex() { return AddColumn(0, 0, true); }
ItemRect& AddIndex() { return AddColumn("", 0, true); }
ItemRect& AddIndex(Id id) { return AddColumn(id, ~id, 0, true); }
ItemRect& AddIndex(const char *name) { return AddColumn(name, 0, true); }
ItemRect& AddIndex(String &name) { return AddColumn(name, 0, true); }