strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gtk3: misc cleanups

Browse source
This commit is contained in:
Cosimo Cecchi 2011-11-02 22:27:43 -04:00
parent 585140eb25
commit d444079d03
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vcl/inc/unx/gtk/gtkgdi.hxx
View file

@ -88,10 +88,12 @@ private:
void PaintScrollbar(GtkStyleContext *context, void PaintScrollbar(GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
const Rectangle& rControlRectangle, const Rectangle& rControlRectangle,
ControlType nType,
ControlPart nPart, ControlPart nPart,
const ImplControlValue& aValue ); const ImplControlValue& aValue );
void PaintOneSpinButton( GtkStyleContext *context, void PaintOneSpinButton( GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
ControlType nType,
ControlPart nPart, ControlPart nPart,
Rectangle aAreaRect, Rectangle aAreaRect,
ControlState nState ); ControlState nState );
@ -99,6 +101,7 @@ private:
cairo_t *cr, cairo_t *cr,
const Rectangle& rControlRectangle, const Rectangle& rControlRectangle,
ControlType nType, ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue ); const ImplControlValue& aValue );
void PaintCombobox( GtkStyleContext *context, void PaintCombobox( GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,

11
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
View file

@ -257,6 +257,7 @@ Rectangle GtkSalGraphics::NWGetScrollButtonRect( ControlPart nPart, Rectangle aA
void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
const Rectangle& rControlRectangle, const Rectangle& rControlRectangle,
ControlType nType,
ControlPart nPart, ControlPart nPart,
const ImplControlValue& aValue ) const ImplControlValue& aValue )
{ {
@ -542,6 +543,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context,
void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context, void GtkSalGraphics::PaintOneSpinButton( GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
ControlType nType,
ControlPart nPart, ControlPart nPart,
Rectangle aAreaRect, Rectangle aAreaRect,
ControlState nState ) ControlState nState )
@ -588,6 +590,7 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
cairo_t *cr, cairo_t *cr,
const Rectangle& rControlRectangle, const Rectangle& rControlRectangle,
ControlType nType, ControlType nType,
ControlPart nPart,
const ImplControlValue& aValue ) const ImplControlValue& aValue )
{ {
Rectangle areaRect; Rectangle areaRect;
@ -637,8 +640,8 @@ void GtkSalGraphics::PaintSpinButton(GtkStyleContext *context,
areaRect.GetWidth(), areaRect.GetHeight() ); areaRect.GetWidth(), areaRect.GetHeight() );
} }
PaintOneSpinButton(context, cr, upBtnPart, areaRect, upBtnState ); PaintOneSpinButton(context, cr, nType, upBtnPart, areaRect, upBtnState );
PaintOneSpinButton(context, cr, downBtnPart, areaRect, downBtnState ); PaintOneSpinButton(context, cr, nType, downBtnPart, areaRect, downBtnState );
} }
#define ARROW_SIZE 11 * 0.85 #define ARROW_SIZE 11 * 0.85
@ -913,10 +916,10 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart
MIN(rControlRegion.GetWidth(), 1 + rControlRegion.GetHeight())); MIN(rControlRegion.GetWidth(), 1 + rControlRegion.GetHeight()));
break; break;
case RENDER_SCROLLBAR: case RENDER_SCROLLBAR:
PaintScrollbar(context, cr, rControlRegion, nPart, aValue); PaintScrollbar(context, cr, rControlRegion, nType, nPart, aValue);
break; break;
case RENDER_SPINBUTTON: case RENDER_SPINBUTTON:
PaintSpinButton(context, cr, rControlRegion, nType, aValue); PaintSpinButton(context, cr, rControlRegion, nType, nPart, aValue);
break; break;
case RENDER_COMBOBOX: case RENDER_COMBOBOX:
PaintCombobox(context, cr, rControlRegion, nType, nPart, aValue); PaintCombobox(context, cr, rControlRegion, nType, nPart, aValue);