diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /libXaw/src/Panner.c | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'libXaw/src/Panner.c')
| -rw-r--r-- | libXaw/src/Panner.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libXaw/src/Panner.c b/libXaw/src/Panner.c index 2ab88f5ed..aa902336e 100644 --- a/libXaw/src/Panner.c +++ b/libXaw/src/Panner.c @@ -635,7 +635,7 @@ parse_page_string(char *s, int pagesize, int canvassize, Bool *relative) XmuLocatePixmapFile(pw->core.screen, pw->panner.stipple_name, \ pw->panner.shadow_color, pw->core.background_pixel, \ pw->core.depth, NULL, 0, NULL, NULL, NULL, NULL) - + #define PIXMAP_OKAY(pm) ((pm) != None && (pm) != XtUnspecifiedPixmap) /*ARGSUSED*/ @@ -663,7 +663,7 @@ XawPannerInitialize(Widget greq, Widget gnew, ArgList args, Cardinal *num_args) cnew->panner.slider_gc = NULL; reset_slider_gc(cnew); /* foreground */ cnew->panner.xor_gc = NULL; - reset_xor_gc(cnew); /* foreground ^ background */ + reset_xor_gc(cnew); /* foreground ^ background */ rescale(cnew); /* does a position check */ cnew->panner.shadow_valid = False; @@ -822,7 +822,7 @@ XawPannerSetValues(Widget gcur, Widget greq, Widget gnew, Bool loc = cur->panner.slider_x != cnew->panner.slider_x || cur->panner.slider_y != cnew->panner.slider_y; Bool siz = cur->panner.slider_width != cnew->panner.slider_width || - cur->panner.slider_height != cnew->panner.slider_height; + cur->panner.slider_height != cnew->panner.slider_height; if (loc || siz || (cur->panner.allow_off != cnew->panner.allow_off && cnew->panner.allow_off)) { scale_knob(cnew, loc, siz); |