diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2019-10-21 19:34:57 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2019-10-21 19:34:57 (GMT) |
| commit | ae382da425ff71af3376e8c202403167a6136a04 (patch) | |
| tree | ff9b4a2ef9f6dbcacbb19b5889104643da2ffad5 /tksao/colorbar | |
| parent | 272255a255fb127a5d767170688090e09537d400 (diff) | |
| download | blt-ae382da425ff71af3376e8c202403167a6136a04.zip blt-ae382da425ff71af3376e8c202403167a6136a04.tar.gz blt-ae382da425ff71af3376e8c202403167a6136a04.tar.bz2 | |
add support for MacOS darkmode
Diffstat (limited to 'tksao/colorbar')
| -rw-r--r-- | tksao/colorbar/cbgrid.C | 2 | ||||
| -rw-r--r-- | tksao/colorbar/cbgrid.h | 4 | ||||
| -rw-r--r-- | tksao/colorbar/parser.C | 10 | ||||
| -rw-r--r-- | tksao/colorbar/parser.Y | 10 |
4 files changed, 13 insertions, 13 deletions
diff --git a/tksao/colorbar/cbgrid.C b/tksao/colorbar/cbgrid.C index bbf1b64..6e206ce 100644 --- a/tksao/colorbar/cbgrid.C +++ b/tksao/colorbar/cbgrid.C @@ -78,7 +78,7 @@ int CBGrid::render() return doit(X11); } -int CBGrid::ps(Widget::PSColorSpace mode, int x, int y) +int CBGrid::ps(PSColorSpace mode, int x, int y) { matrix_ = Translate(x,y); mode_ = mode; diff --git a/tksao/colorbar/cbgrid.h b/tksao/colorbar/cbgrid.h index 57fe867..8a935bc 100644 --- a/tksao/colorbar/cbgrid.h +++ b/tksao/colorbar/cbgrid.h @@ -9,7 +9,7 @@ #include "grid2dbase.h" #include "vector.h" -#include "widget.h" +#include "util.h" class CBGrid : public Grid2dBase { private: @@ -22,7 +22,7 @@ class CBGrid : public Grid2dBase { CBGrid(Widget*, int, double*); int render(); - int ps(Widget::PSColorSpace, int, int); + int ps(PSColorSpace, int, int); #ifdef MAC_OSX_TK int macosx(int, int); #endif diff --git a/tksao/colorbar/parser.C b/tksao/colorbar/parser.C index deb2241..73ec7f2 100644 --- a/tksao/colorbar/parser.C +++ b/tksao/colorbar/parser.C @@ -1897,7 +1897,7 @@ yyreduce: case 76: #line 210 "colorbar/parser.Y" - {cb->psColorSpaceCmd((Widget::PSColorSpace)(yyvsp[(2) - (2)].integer));;} + {cb->psColorSpaceCmd((PSColorSpace)(yyvsp[(2) - (2)].integer));;} break; case 77: @@ -1912,22 +1912,22 @@ yyreduce: case 79: #line 215 "colorbar/parser.Y" - {(yyval.integer) = Widget::BW;;} + {(yyval.integer) = BW;;} break; case 80: #line 216 "colorbar/parser.Y" - {(yyval.integer) = Widget::GRAY;;} + {(yyval.integer) = GRAY;;} break; case 81: #line 217 "colorbar/parser.Y" - {(yyval.integer) = Widget::RGB;;} + {(yyval.integer) = RGB;;} break; case 82: #line 218 "colorbar/parser.Y" - {(yyval.integer) = Widget::CMYK;;} + {(yyval.integer) = CMYK;;} break; case 85: diff --git a/tksao/colorbar/parser.Y b/tksao/colorbar/parser.Y index 117d324..c268f41 100644 --- a/tksao/colorbar/parser.Y +++ b/tksao/colorbar/parser.Y @@ -207,15 +207,15 @@ map : STRING {cb->mapCmd($1);} ; postscript : COLORSPACE_ pscolorspace - {cb->psColorSpaceCmd((Widget::PSColorSpace)$2);} + {cb->psColorSpaceCmd((PSColorSpace)$2);} | LEVEL_ INT {cb->psLevelCmd($2);} | RESOLUTION_ INT {cb->psResolutionCmd($2);} ; -pscolorspace : BW_ {$$ = Widget::BW;} - | GRAY_ {$$ = Widget::GRAY;} - | RGB_ {$$ = Widget::RGB;} - | CMYK_ {$$ = Widget::CMYK;} +pscolorspace : BW_ {$$ = BW;} + | GRAY_ {$$ = GRAY;} + | RGB_ {$$ = RGB;} + | CMYK_ {$$ = CMYK;} ; tag : DELETE_ tagdelete |