diff options
Diffstat (limited to 'vcl/inc/win/salgdi.h')
| -rw-r--r-- | vcl/inc/win/salgdi.h | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 66c561830e49..4e53806e8751 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -40,6 +40,7 @@ class FontSelectPattern; class ImplWinFontEntry; class ImplFontAttrCache; class PhysicalFontCollection; +class SalGraphicsImpl; #define RGB_TO_PALRGB(nRGB) ((nRGB)|0x02000000) #define PALRGB_TO_RGB(nPalRGB) ((nPalRGB)&0x00ffffff) @@ -144,6 +145,8 @@ public: class WinSalGraphics : public SalGraphics { private: + boost::scoped_ptr<SalGraphicsImpl> mpImpl; + HDC mhLocalDC; // HDC public: @@ -152,20 +155,18 @@ public: public: HWND mhWnd; // Window-Handle, when Window-Graphics + + HWND gethWnd(); HFONT mhFonts[ MAX_FALLBACK ]; // Font + Fallbacks const ImplWinFontData* mpWinFontData[ MAX_FALLBACK ]; // pointer to the most recent font face ImplWinFontEntry* mpWinFontEntry[ MAX_FALLBACK ]; // pointer to the most recent font instance float mfFontScale[ MAX_FALLBACK ]; // allows metrics emulation of huge font sizes float mfCurrentFontScale; - HPEN mhPen; // Pen - HBRUSH mhBrush; // Brush HRGN mhRegion; // vcl::Region Handle HPEN mhDefPen; // DefaultPen HBRUSH mhDefBrush; // DefaultBrush HFONT mhDefFont; // DefaultFont HPALETTE mhDefPal; // DefaultPalette - COLORREF mnPenColor; // PenColor - COLORREF mnBrushColor; // BrushColor COLORREF mnTextColor; // TextColor RGNDATA* mpClipRgnData; // ClipRegion-Data RGNDATA* mpStdClipRgnData; // Cache Standard-ClipRegion-Data @@ -179,19 +180,10 @@ public: int mnPenWidth; // Linienbreite /// bitfield - bool mbStockPen : 1; // is Pen a stockpen - bool mbStockBrush : 1; // is Brush a stcokbrush - bool mbPen : 1; // is Pen (FALSE == NULL_PEN) - bool mbBrush : 1; // is Brush (FALSE == NULL_BRUSH) bool mbPrinter : 1; // is Printer bool mbVirDev : 1; // is VirDev bool mbWindow : 1; // is Window bool mbScreen : 1; // is Screen compatible - bool mbXORMode : 1; // _every_ output with RasterOp XOR - - // remember RGB values for SetLineColor/SetFillColor - SalColor maLineColor; - SalColor maFillColor; HFONT ImplDoSetFont( FontSelectPattern* i_pFont, float& o_rFontScale, HFONT& o_rOldFont ); @@ -270,7 +262,6 @@ protected: private: // local helpers - bool tryDrawBitmapGdiPlus(const SalTwoRect& rTR, const SalBitmap& rSrcBitmap); // get kernign pairs of the current font sal_uLong GetKernPairs(); |