diff options
author | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-10-09 10:50:44 +0000 |
---|---|---|
committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2016-12-20 14:19:17 +0100 |
commit | 294958c73990eb69cb7ffbf8d84bd95eaef8a88d (patch) | |
tree | 38dd08cebee55af3f27244991cab2e5a7798c2c6 /vcl/unx | |
parent | f3fdd6ead743d5ce883bb4dab4857f40f1092a75 (diff) |
Update duplicated / outdated NWS documentation
Removes the old, copied NWS documentation blocks from all native
implementations and update the parent SalGraphics documentation.
Change-Id: I0eff8ea0987c5c841e1b023340b1c3787c09e2ca
Diffstat (limited to 'vcl/unx')
-rw-r--r-- | vcl/unx/gtk/salnativewidgets-gtk.cxx | 37 | ||||
-rw-r--r-- | vcl/unx/kde/salnativewidgets-kde.cxx | 45 | ||||
-rw-r--r-- | vcl/unx/kde4/KDESalGraphics.hxx | 70 |
3 files changed, 15 insertions, 137 deletions
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index a3eea1636475..8d0c96c42a1f 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -632,12 +632,6 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, X11SalGraphics::copyBits( rPosAry, pSrcGraphics ); } -/* - * IsNativeControlSupported() - * - * Returns true if the platform supports native - * drawing of the control defined by nPart - */ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { switch(nType) @@ -741,15 +735,6 @@ bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP return false; } -/* - * HitTestNativeScrollbar() - * - * bIsInside is set to true if aPos is contained within the - * given part of the control, whose bounding region is - * given by rControlRegion (in VCL frame coordinates). - * - * returns whether bIsInside was really set. - */ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -852,15 +837,6 @@ bool GtkSalGraphics::hitTestNativeControl( ControlType nType, } } -/* - * DrawNativeControl() - * - * Draws the requested control described by nPart/nState. - * - * rControlRegion: The bounding region of the complete control in VCL frame coordinates. - * aValue: An optional value (tristate/numerical/string) - * rCaption: A caption or title string (like button text etc) - */ bool GtkSalGraphics::drawNativeControl(ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption) @@ -1098,19 +1074,6 @@ bool GtkSalGraphics::DoDrawNativeControl( return false; } -/* - * GetNativeControlRegion() - * - * If the return value is true, rNativeBoundingRegion - * contains the true bounding region covered by the control - * including any adornment, while rNativeContentRegion contains the area - * within the control that can be safely drawn into without drawing over - * the borders of the control. - * - * rControlRegion: The bounding region of the control in VCL frame coordinates. - * aValue: An optional value (tristate/numerical/string) - * rCaption: A caption or title string (like button text etc) - */ bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index de55f1bb05d3..dc3cd619d649 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1254,17 +1254,6 @@ class KDESalGraphics : public X11SalGraphics Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override; }; -/** What widgets can be drawn the native way. - - @param nType - Type of the widget. - - @param nPart - Specification of the widget's part if it consists of more than one. - - @return true if the platform supports native drawing of the widget nType - defined by nPart. -*/ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { return @@ -1292,12 +1281,6 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nP ; } -/** Test whether the position is in the native widget. - - If the return value is true, bIsInside contains information whether - aPos was or was not inside the native widget specified by the - nType/nPart combination. -*/ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) @@ -1393,17 +1376,6 @@ bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, return false; } -/** Draw the requested control described by nPart/nState. - - @param rControlRegion - The bounding region of the complete control in VCL frame coordinates. - - @param aValue - An optional value (tristate/numerical/string). - - @param aCaption - A caption or title string (like button text etc.) -*/ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, @@ -1511,23 +1483,6 @@ bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, return bReturn; } -/** Check if the bounding regions match. - - If the return value is true, rNativeBoundingRegion - contains the true bounding region covered by the control - including any adornment, while rNativeContentRegion contains the area - within the control that can be safely drawn into without drawing over - the borders of the control. - - @param rControlRegion - The bounding region of the control in VCL frame coordinates. - - @param aValue - An optional value (tristate/numerical/string) - - @param aCaption - A caption or title string (like button text etc.) -*/ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue&, diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 38dd169eb9ce..501fbe3ba679 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -27,67 +27,27 @@ #include <QtGui/QImage> -/** handles graphics drawings requests and performs the needed drawing operations */ +/** + * Handles native graphics requests and performs the needed drawing operations. + */ class KDESalGraphics : public X11SalGraphics { - std::unique_ptr<QImage> m_image; - QRect lastPopupRect; - - public: - /** - What widgets can be drawn the native way. - @param type Type of the widget. - @param part Specification of the widget's part if it consists of more than one. - @return true if the platform supports native drawing of the widget type defined by part. - */ - virtual bool IsNativeControlSupported( ControlType type, ControlPart part ) override; - - /** Test whether the position is in the native widget. - If the return value is TRUE, bIsInside contains information whether - aPos was or was not inside the native widget specified by the - type/part combination. - */ - virtual bool hitTestNativeControl( ControlType type, ControlPart part, - const Rectangle& rControlRegion, const Point& aPos, - bool& rIsInside ) override; - /** Draw the requested control described by part/nControlState. - - @param rControlRegion - The bounding Rectangle of the complete control in VCL frame coordinates. +public: + virtual bool IsNativeControlSupported( ControlType, ControlPart ) override; - @param aValue - An optional value (tristate/numerical/string). + virtual bool hitTestNativeControl( ControlType, ControlPart, + const Rectangle&, const Point&, bool& ) override; - @param aCaption - A caption or title string (like button text etc.) - */ - virtual bool drawNativeControl( ControlType type, ControlPart part, - const Rectangle& rControlRegion, ControlState nControlState, - const ImplControlValue& aValue, - const OUString& aCaption ) override; + virtual bool drawNativeControl( ControlType, ControlPart, const Rectangle&, + ControlState, const ImplControlValue&, const OUString& ) override; - /** Check if the bounding regions match. + virtual bool getNativeControlRegion( ControlType, ControlPart, const Rectangle&, + ControlState, const ImplControlValue&, + const OUString&, Rectangle&, Rectangle& ) override; - If the return value is TRUE, rNativeBoundingRegion - contains the true bounding region covered by the control - including any adornment, while rNativeContentRegion contains the area - within the control that can be safely drawn into without drawing over - the borders of the control. - - @param rControlRegion - The bounding region of the control in VCL frame coordinates. - - @param aValue - An optional value (tristate/numerical/string) - - @param aCaption - A caption or title string (like button text etc.) - */ - virtual bool getNativeControlRegion( ControlType type, ControlPart part, - const Rectangle& rControlRegion, ControlState nControlState, - const ImplControlValue& aValue, - const OUString& aCaption, - Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) override; +private: + std::unique_ptr<QImage> m_image; + QRect lastPopupRect; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |