diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 13:31:44 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 13:31:44 +0000 |
| commit | 46a63a2af38e694327c5308168f499a549fb724e (patch) | |
| tree | 6e80cfea121ed9231141a56153e9208f553863cb /vcl/unx/inc | |
| parent | 248539e2fa8ac0f5271a83f26fe71d0dcc4a5a67 (diff) | |
CWS-TOOLING: integrate CWS vcl92
Diffstat (limited to 'vcl/unx/inc')
| -rw-r--r-- | vcl/unx/inc/plugins/gtk/gtkgdi.hxx | 7 | ||||
| -rw-r--r-- | vcl/unx/inc/pspgraphics.h | 1 | ||||
| -rw-r--r-- | vcl/unx/inc/saldisp.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/inc/salgdi.h | 1 |
4 files changed, 7 insertions, 5 deletions
diff --git a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx index 2458ff45a974..5211367c355a 100644 --- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx +++ b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gtkgdi.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.50.1 $ * * This file is part of OpenOffice.org. * @@ -171,6 +171,11 @@ protected: const clipList& rClipList, ControlState nState, const ImplControlValue& aValue, SalControlHandle& rControlHandle, const OUString& rCaption ); + BOOL NWPaintGTKListNode( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, + const Rectangle& rControlRectangle, + const clipList& rClipList, + ControlState nState, const ImplControlValue& aValue, + SalControlHandle& rControlHandle, const OUString& rCaption ); BOOL drawNativeMixedStateCheck( ControlType nType, ControlPart nPart, const Region& rControlRegion, ControlState nState, const ImplControlValue& aValue, SalControlHandle& rControlHandle, diff --git a/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h index 5cc0d38090b2..e8cf38dfc49e 100644 --- a/vcl/unx/inc/pspgraphics.h +++ b/vcl/unx/inc/pspgraphics.h @@ -97,7 +97,6 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual void GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); virtual USHORT GetBitCount(); virtual long GetGraphicsWidth() const; diff --git a/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx index 011d9a4fa5b1..d662ce51d855 100644 --- a/vcl/unx/inc/saldisp.hxx +++ b/vcl/unx/inc/saldisp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: saldisp.hxx,v $ - * $Revision: 1.47 $ + * $Revision: 1.47.6.1 $ * * This file is part of OpenOffice.org. * @@ -495,7 +495,6 @@ public: bool GetExactResolution() const { return mbExactResolution; } ULONG GetProperties() const { return nProperties_; } ULONG GetMaxRequestSize() const { return nMaxRequestSize_; } - void GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) const; BOOL MouseCaptured( const SalFrame *pFrameData ) const { return m_pCapture == pFrameData; } diff --git a/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h index c16ca3bf1086..b3e1efbdab44 100644 --- a/vcl/unx/inc/salgdi.h +++ b/vcl/unx/inc/salgdi.h @@ -226,7 +226,6 @@ public: // overload all pure virtual methods virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); - virtual void GetScreenFontResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ); virtual USHORT GetBitCount(); virtual long GetGraphicsWidth() const; virtual long GetGraphicsHeight() const; |