diff options
| -rw-r--r-- | vcl/inc/win/salgdi.h | 9 | ||||
| -rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 46 |
2 files changed, 8 insertions, 47 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 798a99b60233..57b138199ce8 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -194,14 +194,13 @@ public: HFONT ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ); public: - explicit WinSalGraphics(); explicit WinSalGraphics(WinSalGraphics::Type eType, bool bScreen); virtual ~WinSalGraphics(); - bool isPrinter(); - bool isVirtualDevice(); - bool isWindow(); - bool isScreen(); + bool isPrinter() const; + bool isVirtualDevice() const; + bool isWindow() const; + bool isScreen() const; protected: virtual bool setClipRegion( const vcl::Region& ); diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 7eb758f09b43..c9f9cf4be19c 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -554,44 +554,6 @@ void ImplClearHDCCache( SalData* pData ) } } -WinSalGraphics::WinSalGraphics(): - mpImpl(new WinSalGraphicsImpl(*this)), - mhLocalDC(0), - mbPrinter(false), - mbVirDev(false), - mbWindow(false), - mbScreen(false), - mfCurrentFontScale(1.0), - mhRegion(0), - mhDefPen(0), - mhDefBrush(0), - mhDefFont(0), - mhDefPal(0), - mpStdClipRgnData(NULL), - mpLogFont(NULL), - mpFontCharSets(NULL), - mpFontAttrCache(NULL), - mnFontCharSetCount(0), - mpFontKernPairs(NULL), - mnFontKernPairCount(0), - mbFontKernInit(false), - mnPenWidth(GSL_PEN_WIDTH) -{ - for( int i = 0; i < MAX_FALLBACK; ++i ) - { - mhFonts[ i ] = 0; - mpWinFontData[ i ] = NULL; - mpWinFontEntry[ i ] = NULL; - mfFontScale[ i ] = 1.0; - } - - static const char* pEnv = getenv("USE_OPENGL"); - if (pEnv) - { - mpImpl.reset(new OpenGLSalGraphicsImpl()); - } -} - WinSalGraphics::WinSalGraphics(WinSalGraphics::Type eType, bool bScreen): mpImpl(new WinSalGraphicsImpl(*this)), mhLocalDC(0), @@ -651,22 +613,22 @@ WinSalGraphics::~WinSalGraphics() delete mpFontKernPairs; } -bool WinSalGraphics::isPrinter() +bool WinSalGraphics::isPrinter() const { return mbPrinter; } -bool WinSalGraphics::isVirtualDevice() +bool WinSalGraphics::isVirtualDevice() const { return mbVirDev; } -bool WinSalGraphics::isWindow() +bool WinSalGraphics::isWindow() const { return mbWindow; } -bool WinSalGraphics::isScreen() +bool WinSalGraphics::isScreen() const { return mbScreen; } |