From c69256de01cafa57e873caeae17c0dfea3f00239 Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 25 Feb 2020 17:52:47 +0000 Subject: [PATCH] CtrlLib: Fix in ArrayCtrl::AsText, GLCtrl: Fixed for WIN32 CLANG git-svn-id: svn://ultimatepp.org/upp/trunk@14089 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/ArrayCtrl.cpp | 2 +- uppsrc/GLCtrl/GLCtrl.upp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/uppsrc/CtrlLib/ArrayCtrl.cpp b/uppsrc/CtrlLib/ArrayCtrl.cpp index 79025139d..0ce3d1a79 100644 --- a/uppsrc/CtrlLib/ArrayCtrl.cpp +++ b/uppsrc/CtrlLib/ArrayCtrl.cpp @@ -3018,7 +3018,7 @@ String ArrayCtrl::AsText(String (*format)(const Value&), bool sel, bool next = false; for(int r = 0; r < GetCount(); r++) if(!sel || IsSel(r)) { - if(next) + if(!next) txt << row; for(int i = 0; i < GetColumnCount(); i++) { if(i) diff --git a/uppsrc/GLCtrl/GLCtrl.upp b/uppsrc/GLCtrl/GLCtrl.upp index 32a72496a..e3aba5572 100644 --- a/uppsrc/GLCtrl/GLCtrl.upp +++ b/uppsrc/GLCtrl/GLCtrl.upp @@ -2,7 +2,7 @@ uses CtrlCore, plugin/glew; -library(WIN32 GCC) "glaux glu32 opengl32"; +library(WIN32 (GCC | CLANG)) "glaux glu32 opengl32"; pkg_config(LINUX | BSD) "gl glu";