From 77d67718bc9fb65eab43c4e6feb4348ca2edcffd Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 14 May 2008 13:45:33 +0000 Subject: [PATCH] fix set-smoothing (to be a no-op) when Cairo is disabled svn: r9832 --- src/wxxt/src/DeviceContexts/WindowDC.cc | 24 ++++++++++++------------ src/wxxt/src/DeviceContexts/WindowDC.h | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/wxxt/src/DeviceContexts/WindowDC.cc b/src/wxxt/src/DeviceContexts/WindowDC.cc index 11a1a4a062..4945605d65 100644 --- a/src/wxxt/src/DeviceContexts/WindowDC.cc +++ b/src/wxxt/src/DeviceContexts/WindowDC.cc @@ -3829,18 +3829,6 @@ Bool wxWindowDC::SetCairoBrush() return FALSE; } -void wxWindowDC::SetAntiAlias(int v) -{ -#ifdef WX_USE_CAIRO - if (v != anti_alias) { - /* In case we go from aligned to not: */ - X->reset_cairo_clip = 1; - } - - wxDC::SetAntiAlias(v); -#endif -} - void wxWindowDC::SetAlpha(double d) { wxDC::SetAlpha(d); @@ -3933,3 +3921,15 @@ double wxWindowDC::SmoothingXFormHL(double h, double y) return h; } #endif + +void wxWindowDC::SetAntiAlias(int v) +{ +#ifdef WX_USE_CAIRO + if (v != anti_alias) { + /* In case we go from aligned to not: */ + X->reset_cairo_clip = 1; + } + + wxDC::SetAntiAlias(v); +#endif +} diff --git a/src/wxxt/src/DeviceContexts/WindowDC.h b/src/wxxt/src/DeviceContexts/WindowDC.h index 586b3ada49..f39b41c658 100644 --- a/src/wxxt/src/DeviceContexts/WindowDC.h +++ b/src/wxxt/src/DeviceContexts/WindowDC.h @@ -202,14 +202,14 @@ public: void SetGLConfig(wxGLConfig *cfg); #endif + void SetAntiAlias(int v); + #ifdef WX_USE_CAIRO void InitCairoDev(); void ReleaseCairoDev(); Bool SetCairoPen(); Bool SetCairoBrush(); - void SetAntiAlias(int v); - void SetAlpha(double d); Bool AlignSmoothing();