From 5d2c2b27a6323e2666378b986129b2a7c2c39e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Feb 2022 16:04:24 +0100 Subject: New upstream version 5.2.2GA --- app/wlib/mswlib/mswcolor.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'app/wlib/mswlib/mswcolor.c') diff --git a/app/wlib/mswlib/mswcolor.c b/app/wlib/mswlib/mswcolor.c index 41bf6a9..fb9b0ba 100644 --- a/app/wlib/mswlib/mswcolor.c +++ b/app/wlib/mswlib/mswcolor.c @@ -25,8 +25,8 @@ #define NUM_GRAYS (16) #define NUM_COLORS (256) -wDrawColor wDrawColorWhite = 0; -wDrawColor wDrawColorBlack = 1; +static wDrawColor wDrawColorWhite = 0; +static wDrawColor wDrawColorBlack = 1; #define MAX_COLOR_DISTANCE (3) @@ -45,8 +45,6 @@ static struct { { 0, 0, 0 } /* Black */ } }; -COLORREF mappedColors[NUM_COLORS]; - static long flipRGB( long rgb ) { @@ -236,6 +234,7 @@ static void mswGetCustomColors( void ) strcpy( colorName, "custom-" ); for ( inx=0; inx<16; inx++ ) { sprintf( colorName+7, "%d", inx ); + /** @prefs [mswcolor] custom-0= to custom-15= Set custom colors */ wPrefGetInteger( "mswcolor", colorName, &rgb, 0 ); aclrCust[inx] = flipRGB(rgb); } @@ -316,12 +315,12 @@ static void doColorButton( wButton_p wColorSelectButtonCreate( wWin_p win, - wPos_t x, - wPos_t y, + wWinPix_t x, + wWinPix_t y, const char * helpStr, const char * labelStr, long option, - wPos_t width, + wWinPix_t width, wDrawColor * color, wColorSelectButtonCallBack_p action, void * data ) -- cgit v1.2.3