diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-11-02 22:27:43 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-11-03 13:15:10 -0400 |
| commit | d444079d0383bac55376b5cfdf6b52a3f0e71dc4 (patch) | |
| tree | 21cc83d4050be45a340f31fc0b6b872dab57f906 | |
| parent | 585140eb253d28644f8abce66786128271378c0b (diff) | |
gtk3: misc cleanups
| -rw-r--r-- | vcl/inc/unx/gtk/gtkgdi.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index c7e1eb2ef054..6722ceabdbca 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -88,10 +88,12 @@ private: void PaintScrollbar(GtkStyleContext *context, cairo_t *cr, const Rectangle& rControlRectangle, + ControlType nType, ControlPart nPart, const ImplControlValue& aValue ); void PaintOneSpinButton( GtkStyleContext *context, cairo_t *cr, + ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState ); @@ -99,6 +101,7 @@ private: cairo_t *cr, const Rectangle& rControlRectangle, ControlType nType, + ControlPart nPart, const ImplControlValue& aValue ); void PaintCombobox( GtkStyleContext *context, cairo_t *cr, diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 365f4701c549..a7a9b0f48dde 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -257,6 +257,7 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, cairo_t *cr, const Rectangle& rControlRectangle, + ControlType nType, ControlPart nPart, const ImplControlValue& aValue ) { @@ -542,6 +543,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, cairo_t *cr, + ControlType nType, ControlPart nPart, Rectangle aAreaRect, ControlState nState ) @@ -588,6 +590,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, cairo_t *cr, const Rectangle& rControlRectangle, ControlType nType, + ControlPart nPart, const ImplControlValue& aValue ) { Rectangle areaRect; @@ -637,8 +640,8 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context, areaRect.GetWidth(), areaRect.GetHeight() ); } - PaintOneSpinButton(context, cr, upBtnPart, areaRect, upBtnState ); - PaintOneSpinButton(context, cr, downBtnPart, areaRect, downBtnState ); + PaintOneSpinButton(context, cr, nType, upBtnPart, areaRect, upBtnState ); + PaintOneSpinButton(context, cr, nType, downBtnPart, areaRect, downBtnState ); } #define ARROW_SIZE 11 * 0.85 @@ -913,10 +916,10 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart MIN(rControlRegion.GetWidth(), 1 + rControlRegion.GetHeight())); break; case RENDER_SCROLLBAR: - PaintScrollbar(context, cr, rControlRegion, nPart, aValue); + PaintScrollbar(context, cr, rControlRegion, nType, nPart, aValue); break; case RENDER_SPINBUTTON: - PaintSpinButton(context, cr, rControlRegion, nType, aValue); + PaintSpinButton(context, cr, rControlRegion, nType, nPart, aValue); break; case RENDER_COMBOBOX: PaintCombobox(context, cr, rControlRegion, nType, nPart, aValue); |