From 2153a93430d59e64eac654ac44e05e51fdd98045 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 20 Dec 2018 18:56:16 +0100 Subject: Fix line endings. Note: we recommend `git config core.autocrlf true'. --- test/sudoku.rc | 144 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 72 insertions(+), 72 deletions(-) (limited to 'test') diff --git a/test/sudoku.rc b/test/sudoku.rc index 107c9a69f..36fb10d18 100644 --- a/test/sudoku.rc +++ b/test/sudoku.rc @@ -1,72 +1,72 @@ -//Microsoft Developer Studio generated resource script. -// -#include "sudokurc.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -//#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "icons.h\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON ICON DISCARDABLE "sudoku.ico" -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - +//Microsoft Developer Studio generated resource script. +// +#include "sudokurc.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +//#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +//LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "icons.h\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON ICON DISCARDABLE "sudoku.ico" +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + -- cgit v1.2.3 From 29fe0c43df7bad2df0f4445994b9d5d851bc2cdb Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 29 Dec 2018 01:19:51 +0100 Subject: Remove obsolete condition to make static analysis happy. --- test/blocks.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/blocks.cxx b/test/blocks.cxx index c7d3979ed..6135313ba 100644 --- a/test/blocks.cxx +++ b/test/blocks.cxx @@ -771,7 +771,7 @@ int BlockWindow::handle(int event) { b = 0; for (j = 0, c = columns_; !count && j < num_columns_; j ++, c ++) - for (k = 0, b = c->blocks; !count && k < c->num_blocks; k ++, b ++) + for (k = 0, b = c->blocks; k < c->num_blocks; k ++, b ++) if (mx >= c->x && mx < (c->x + BLOCK_SIZE) && my >= b->y && my < (b->y + BLOCK_SIZE)) { if (b->bomb) count = bomb(b->color); -- cgit v1.2.3 From 95ab1dd73e9c5ea845ce03340b2861ea8a652b7e Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 29 Dec 2018 02:03:49 +0100 Subject: Fixing STR #2901, wrongly escaping the formatting character code in Fl_Browser. --- test/browser.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test') diff --git a/test/browser.cxx b/test/browser.cxx index 48edd302b..a3485ca15 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -45,6 +45,9 @@ That was a blank line above this. @C2Green @C4Blue +@@ start line with '@' +@.@ alternative start line with '@' + You should try different browser types: Fl_Browser Fl_Select_Browser @@ -164,6 +167,7 @@ int main(int argc, char **argv) { browser->callback(b_cb); // browser->scrollbar_right(); //browser->has_scrollbar(Fl_Browser::BOTH_ALWAYS); + //browser->format_char('#'); if (!browser->load(fname)) { int done = 0; #ifdef _MSC_VER -- cgit v1.2.3 From c099837a3e80e8f2c1634e5f1861d268e82622fe Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 29 Dec 2018 02:08:40 +0100 Subject: Also testing # as a format_char() --- test/browser.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'test') diff --git a/test/browser.cxx b/test/browser.cxx index a3485ca15..e0ea9e799 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -47,6 +47,10 @@ That was a blank line above this. @@ start line with '@' @.@ alternative start line with '@' +@l@@ start tall line with '@' +@s@@ start small line with '@' +#s## start line with '#' +#s#.# alternative start line with '#' You should try different browser types: Fl_Browser -- cgit v1.2.3 From bf48acdbe53bd9fdebaa731831cea946f394350d Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Sat, 29 Dec 2018 02:16:40 +0100 Subject: Adding documentation for '@N', inactive color. --- test/browser.cxx | 1 + 1 file changed, 1 insertion(+) (limited to 'test') diff --git a/test/browser.cxx b/test/browser.cxx index e0ea9e799..749a7ed83 100644 --- a/test/browser.cxx +++ b/test/browser.cxx @@ -44,6 +44,7 @@ That was a blank line above this. @C1RED @C2Green @C4Blue +@N@.Inactive @@ start line with '@' @.@ alternative start line with '@' -- cgit v1.2.3