From 555ffb4153cc1cab86381186de622a01b202fc31 Mon Sep 17 00:00:00 2001 From: koldo Date: Wed, 8 Jan 2014 17:53:59 +0000 Subject: [PATCH] DropGrid: Replaced NULL with "" git-svn-id: svn://ultimatepp.org/upp/trunk@6735 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/DropGrid/DropGrid.cpp | 2 +- uppsrc/DropGrid/DropGrid.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/uppsrc/DropGrid/DropGrid.cpp b/uppsrc/DropGrid/DropGrid.cpp index eb86839ab..b06ccc685 100644 --- a/uppsrc/DropGrid/DropGrid.cpp +++ b/uppsrc/DropGrid/DropGrid.cpp @@ -441,7 +441,7 @@ DropGrid& DropGrid::Searching(bool b /* = true*/) return *this; } -DropGrid& DropGrid::MustChange(bool b /* = true*/, const char* s /* = NULL*/) +DropGrid& DropGrid::MustChange(bool b /* = true*/, const char* s /* = ""*/) { must_change = b; if(s) diff --git a/uppsrc/DropGrid/DropGrid.h b/uppsrc/DropGrid/DropGrid.h index bbe7a251e..60ec33b68 100644 --- a/uppsrc/DropGrid/DropGrid.h +++ b/uppsrc/DropGrid/DropGrid.h @@ -117,7 +117,7 @@ class DropGrid : public Convert, public GridDisplay, public Ctrl DropGrid& DropEnter(bool b = true); DropGrid& DataAction(bool b = true); DropGrid& Searching(bool b = true); - DropGrid& MustChange(bool b = true, const char* s = NULL); + DropGrid& MustChange(bool b = true, const char* s = ""); DropGrid& NullAction(bool b = true); DropGrid& ClearButton(bool b = true); DropGrid& NoDrop(bool b = true); @@ -126,7 +126,7 @@ class DropGrid : public Convert, public GridDisplay, public Ctrl GridCtrl::ItemRect& AddColumn(const char *name, int width = -1, bool idx = false); GridCtrl::ItemRect& AddColumn(Id id, const char *name, int width = -1, bool idx = false); - GridCtrl::ItemRect& AddIndex(const char *name = NULL); + GridCtrl::ItemRect& AddIndex(const char *name = ""); GridCtrl::ItemRect& AddIndex(Id id); MultiButton::SubButton& AddButton(int type, const Callback &cb);