diff --git a/uppsrc/GridCtrl/GridCtrl.cpp b/uppsrc/GridCtrl/GridCtrl.cpp index e0b0de781..50c6fcfb2 100644 --- a/uppsrc/GridCtrl/GridCtrl.cpp +++ b/uppsrc/GridCtrl/GridCtrl.cpp @@ -6472,9 +6472,14 @@ Ctrl * GridCtrl::GetCtrl(int r, int c, bool check_visibility, bool hrel, bool vr return ctrl; } -Ctrl * GridCtrl::GetCtrl(int r, int c, bool check_visibility) +Ctrl * GridCtrl::GetCtrl(int r, int c) { - return GetCtrl(r + fixed_rows, c, check_visibility, true, false); + return GetCtrl(r + fixed_rows, c, true, true, false); +} + +Ctrl * GridCtrl::GetCtrlAt(int r, int c) +{ + return GetCtrl(r + fixed_rows, c, false, true, false); } Ctrl * GridCtrl::GetCtrl(int c) diff --git a/uppsrc/GridCtrl/GridCtrl.h b/uppsrc/GridCtrl/GridCtrl.h index 309ac998b..1c39836fb 100644 --- a/uppsrc/GridCtrl/GridCtrl.h +++ b/uppsrc/GridCtrl/GridCtrl.h @@ -1590,8 +1590,9 @@ class GridCtrl : public Ctrl void Serialize(Stream &s); - Ctrl * GetCtrl(int r, int c, bool check_visibility = true); - Ctrl * GetCtrl(int c); + Ctrl * GetCtrl(int r, int c); // checks visibility - if widget is out of view, returns NULL + Ctrl * GetCtrlAt(int r, int c); // does not check visibility + Ctrl * GetCtrl(int c); // checks visibility - if widget is out of view, returns NULL static int GetStdHeight() { return Draw::GetStdFontCy() + 4; } @@ -1763,7 +1764,7 @@ class GridCtrl : public Ctrl void Nothing(); void Init(); - Ctrl * GetCtrl(int x, int y, bool check_visibility, bool hrel, bool vrel = false, bool check_edits = true); + Ctrl * GetCtrl(int x, int y, bool check_visibility, bool hrel = false, bool vrel = false, bool check_edits = true); Ctrl * GetCtrl(const Point &p, bool check_visibility, bool hrel = false, bool vrel = false, bool check_edits = true); bool IsCtrl(Point &p, bool check_visibility = true);