From 0c4d2e332c185da7832ddb394b4bdccd67d57ae2 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Fri, 17 Dec 2010 10:45:48 -0700 Subject: [PATCH] fix transparent-canvas detection --- collects/mred/private/wx/cocoa/canvas.rkt | 2 +- collects/mred/private/wx/cocoa/dc.rkt | 5 +++-- collects/mred/private/wx/gtk/canvas.rkt | 2 +- collects/mred/private/wx/gtk/dc.rkt | 5 +++-- collects/mred/private/wx/win32/canvas.rkt | 2 +- collects/mred/private/wx/win32/dc.rkt | 5 +++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/collects/mred/private/wx/cocoa/canvas.rkt b/collects/mred/private/wx/cocoa/canvas.rkt index 7c75add225..145fd22427 100644 --- a/collects/mred/private/wx/cocoa/canvas.rkt +++ b/collects/mred/private/wx/cocoa/canvas.rkt @@ -360,7 +360,7 @@ (tellv content-cocoa setDelegate: content-cocoa) (install-control-font content-cocoa #f)) - (define dc (make-object dc% this)) + (define dc (make-object dc% this (memq 'transparent canvas-style))) (send dc start-backing-retained) diff --git a/collects/mred/private/wx/cocoa/dc.rkt b/collects/mred/private/wx/cocoa/dc.rkt index 2984ec5fda..0b821447d9 100644 --- a/collects/mred/private/wx/cocoa/dc.rkt +++ b/collects/mred/private/wx/cocoa/dc.rkt @@ -23,11 +23,12 @@ (define dc% (class backing-dc% - (init [(cnvs canvas)]) + (init [(cnvs canvas)] + transparent?) (define canvas cnvs) (inherit end-delay) - (super-new [transparent? (not (send canvas get-canvas-background))]) + (super-new [transparent? transparent?]) (define gl #f) (define/override (get-gl-context) diff --git a/collects/mred/private/wx/gtk/canvas.rkt b/collects/mred/private/wx/gtk/canvas.rkt index 3fc128e3bc..b0beb092bc 100644 --- a/collects/mred/private/wx/gtk/canvas.rkt +++ b/collects/mred/private/wx/gtk/canvas.rkt @@ -284,7 +284,7 @@ (set-size x y w h) - (define dc (new dc% [canvas this])) + (define dc (new dc% [canvas this] [transparent? (memq 'transparent style)])) (define for-gl? (memq 'gl style)) (when for-gl? diff --git a/collects/mred/private/wx/gtk/dc.rkt b/collects/mred/private/wx/gtk/dc.rkt index 761285924e..383d23c71f 100644 --- a/collects/mred/private/wx/gtk/dc.rkt +++ b/collects/mred/private/wx/gtk/dc.rkt @@ -92,11 +92,12 @@ (define dc% (class backing-dc% - (init [(cnvs canvas)]) + (init [(cnvs canvas)] + transparent?) (inherit end-delay) (define canvas cnvs) - (super-new [transparent? (not (send canvas get-canvas-background))]) + (super-new [transparent? transparent?]) (define gl #f) (define/override (get-gl-context) diff --git a/collects/mred/private/wx/win32/canvas.rkt b/collects/mred/private/wx/win32/canvas.rkt index 49377bb857..323e9964f2 100644 --- a/collects/mred/private/wx/win32/canvas.rkt +++ b/collects/mred/private/wx/win32/canvas.rkt @@ -204,7 +204,7 @@ (define/override (wndproc-for-ctlproc w msg wParam lParam default) (default w msg wParam lParam)) - (define dc (new dc% [canvas this])) + (define dc (new dc% [canvas this] [transparent? (memq 'transparent style)])) (send dc start-backing-retained) (define/public (get-dc) dc) diff --git a/collects/mred/private/wx/win32/dc.rkt b/collects/mred/private/wx/win32/dc.rkt index 91e5b27152..649e673d5d 100644 --- a/collects/mred/private/wx/win32/dc.rkt +++ b/collects/mred/private/wx/win32/dc.rkt @@ -63,11 +63,12 @@ (define dc% (class backing-dc% - (init [(cnvs canvas)]) + (init [(cnvs canvas)] + transparent?) (inherit end-delay) (define canvas cnvs) - (super-new [transparent? (not (send canvas get-canvas-background))]) + (super-new [transparent? transparent?]) (define gl #f) (define/override (get-gl-context)