diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2022-02-06 16:04:57 +0100 |
| commit | 59dccf358523dfc7679d1d8c120452a71e42243c (patch) | |
| tree | f0f3cc006e8157d6bd699bd644b7dd7b35387ac2 /app/wlib/mswlib/mswcolor.c | |
| parent | fd6639655b399a79fb72f494786a4f57da9c90e7 (diff) | |
| parent | d0ca838c7ab297036b4a7c45351761a48fe05efd (diff) | |
Merge branch 'feature/upstrem' into develop
Diffstat (limited to 'app/wlib/mswlib/mswcolor.c')
| -rw-r--r-- | app/wlib/mswlib/mswcolor.c | 13 |
1 files changed, 6 insertions, 7 deletions
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=<rgb> to custom-15=<rgb> 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 ) |