From 346eeb31d1c0a2ee959ecfade3cd66e3dc07cf4b Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 22 Apr 2019 11:37:25 -0400 Subject: backout tcl/tk 8.6.9 --- tksao/frame/colorscaletrue32.C | 2 ++ tksao/frame/frame.C | 1 + tksao/frame/framergb.C | 1 + tksao/frame/frcommand.C | 1 + 4 files changed, 5 insertions(+) diff --git a/tksao/frame/colorscaletrue32.C b/tksao/frame/colorscaletrue32.C index d350ae8..34c44ef 100644 --- a/tksao/frame/colorscaletrue32.C +++ b/tksao/frame/colorscaletrue32.C @@ -16,6 +16,7 @@ ColorScaleTrueColor32::ColorScaleTrueColor32(int s, Visual* visual, int msb) unsigned int g = psColors_[i*3+1]; unsigned int b = psColors_[i*3]; unsigned int a = 0; + // *** waj *** #ifdef MAC_OSX_TK a |= 0xff << 24; #endif @@ -31,6 +32,7 @@ ColorScaleTrueColor32::ColorScaleTrueColor32(int s, Visual* visual, int msb) unsigned int g = psColors_[i*3+1]; unsigned int b = psColors_[i*3]; unsigned int a = 0; + // *** waj *** #ifdef MAC_OSX_TK a |= 0xff << 24; #endif diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C index c3f469a..26efed4 100644 --- a/tksao/frame/frame.C +++ b/tksao/frame/frame.C @@ -548,6 +548,7 @@ void Frame::colormapCmd(int id, float b, float c, int i, update(BASE); } +// *** waj *** #ifndef MAC_OSX_TK void Frame::colormapBeginCmd() { diff --git a/tksao/frame/framergb.C b/tksao/frame/framergb.C index 77538f3..8b4b211 100644 --- a/tksao/frame/framergb.C +++ b/tksao/frame/framergb.C @@ -500,6 +500,7 @@ void FrameRGB::colormapCmd(float rb, float gb, float bb, update(BASE); } +// *** waj *** #ifndef MAC_OSX_TK void FrameRGB::colormapBeginCmd() { diff --git a/tksao/frame/frcommand.C b/tksao/frame/frcommand.C index e93a7e8..62d5c96 100644 --- a/tksao/frame/frcommand.C +++ b/tksao/frame/frcommand.C @@ -354,6 +354,7 @@ void FrameBase::panEndCmd(const Vector& vv) update(MATRIX); } +// *** waj *** #ifndef MAC_OSX_TK void FrameBase::rotateBeginCmd() { -- cgit v0.12