diff options
Diffstat (limited to 'kcontrol/colors/widgetcanvas.cpp')
| -rw-r--r-- | kcontrol/colors/widgetcanvas.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp index b08ef6135..3ee662627 100644 --- a/kcontrol/colors/widgetcanvas.cpp +++ b/kcontrol/colors/widgetcanvas.cpp @@ -315,7 +315,7 @@ void WidgetCanvas::drawSampleWidgets() // Create a scrollbar and redirect drawing into a temp. pixmap to save a // lot of fiddly drawing later. - TQScrollBar *vertScrollBar = new TQScrollBar( Qt::Vertical, this ); + TQScrollBar *vertScrollBar = new TQScrollBar( TQt::Vertical, this ); // TODO: vertScrollBar->setStyle( new TQMotifStyle() ); vertScrollBar->setGeometry( 400, 400, SCROLLBAR_SIZE, height()); vertScrollBar->setRange( 0, 0 ); @@ -324,9 +324,7 @@ void WidgetCanvas::drawSampleWidgets() TQPixmap pm( vertScrollBar->width(), vertScrollBar->height() ); pm.fill( back ); -#ifndef __osf__ TQPainter::redirect( vertScrollBar, &pm ); -#endif vertScrollBar->repaint(); TQPainter::redirect( vertScrollBar, 0 ); vertScrollBar->hide(); @@ -346,7 +344,7 @@ void WidgetCanvas::drawSampleWidgets() // Inactive window - qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, FALSE, + qDrawWinPanel ( &paint, 15, 5, width()-48, height(), cg, false, &brush); paint.setBrush( iaTitle ); @@ -394,7 +392,7 @@ void WidgetCanvas::drawSampleWidgets() // Active window - qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, FALSE, + qDrawWinPanel ( &paint, 20, 25+5, width()-40, height(), cg, false, &brush); paint.setBrush( aTitle );paint.setPen( aTitle ); @@ -434,16 +432,16 @@ void WidgetCanvas::drawSampleWidgets() // Menu bar - //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_PanelMenuBar, &paint, + //qDrawShadePanel ( &paint, 25, 55, width()-52, 28, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_PanelMenuBar, &paint, TQRect(TQPoint(25, 55), TQSize(width()-52, 28)), cg); paint.setFont( menuFont ); paint.setPen(txt ); TQString file = i18n("File"); textLen = paint.fontMetrics().width( file ); - //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, FALSE, 2, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_Panel, &paint, + //qDrawShadePanel ( &paint, 30, 59, textLen + 10, 21, cg, false, 2, &brush); + tdeApp->style().drawPrimitive(TQStyle::PE_Panel, &paint, TQRect(30, 59, textLen + 10, 21), cg); paint.drawText( 35, 74, file ); @@ -465,7 +463,7 @@ void WidgetCanvas::drawSampleWidgets() brush.setColor( window ); qDrawShadePanel ( &paint, 25, 80+5-4, width()-7-45-2, - height(), cg, TRUE, 2, &brush); + height(), cg, true, 2, &brush); // Standard text TQFont fnt = TDEGlobalSettings::generalFont(); @@ -528,7 +526,7 @@ void WidgetCanvas::drawSampleWidgets() cg2.setColor(TQColorGroup::Button, button); cg2.setColor(TQColorGroup::Background, window); //qDrawWinButton(&paint, xpos, ypos, textLen+32, 28, cg, false, &brush); - kapp->style().tqdrawPrimitive(TQStyle::PE_ButtonCommand, &paint, + tdeApp->style().drawPrimitive(TQStyle::PE_ButtonCommand, &paint, TQRect(xpos, ypos, textLen+32, 28), cg2, TQStyle::Style_Enabled | TQStyle::Style_Raised); paint.setPen(buttonTxt); paint.drawText(xpos, ypos, textLen+32, 28, AlignCenter, @@ -585,12 +583,12 @@ void WidgetCanvas::drawSampleWidgets() // Valance qDrawWinPanel ( &paint, 0, 0, width(), height(), - parentWidget()->colorGroup(), TRUE, 0); + parentWidget()->colorGroup(), true, 0); // Stop the painting hotspots[ spot++ ] = HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ? - repaint( FALSE ); + repaint( false ); } |