Automated update from Qt3

1 files changed, 32 insertions, 14 deletions

diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index b404dc91..ea4da207 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -211,6 +211,9 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 				 SFlags flags,
 				 const TQStyleOption& opt ) const
 {
+    bool dis = ! (flags & Style_Enabled);
+    bool act = flags & Style_Active;
+
     switch( pe ) {
 #ifndef QT_NO_LISTVIEW
     case PE_CheckListExclusiveIndicator: {
@@ -761,6 +764,30 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 		     r.height() - 4, cg.brush(TQColorGroup::Highlight));
 	break;
 
+    case PE_PanelScrollBar:
+	qDrawShadePanel(p, r, cg, TRUE,
+		    pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags),
+		    &cg.brush(TQColorGroup::Mid));
+	break;
+
+    case PE_MenuItemIndicatorCheck:
+	{
+	    int x, y, w, h;
+	    r.rect( &x, &y, &w, &h );
+	    TQRect vrect = visualRect( TQRect( x+motifItemFrame, y+motifItemFrame, w, h-2*motifItemFrame ), r );
+	    int xvis = vrect.x();
+	    int mw = w;
+	    int mh = h - 2*motifItemFrame;
+
+	    SFlags cflags = Style_Default;
+		if (! dis)
+		    cflags |= Style_Enabled;
+		if (act)
+		    cflags |= Style_On;
+
+		drawPrimitive(PE_CheckMark, p, ceData, elementFlags, TQRect(xvis, y+motifItemFrame, mw, mh), cg, cflags);
+	}
+
     default:
 	TQCommonStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt );
 	break;
@@ -1076,18 +1103,8 @@ void TQMotifStyle::drawControl( ControlElement element,
 		p->drawPixmap( pmr.topLeft(), pixmap );
 
 	    } else  if ( checkable ) {  // just "checking"...
-		int mw = checkcol;
-		int mh = h - 2*motifItemFrame;
 		if ( mi->isChecked() ) {
-		    SFlags cflags = Style_Default;
-		    if (! dis)
-			cflags |= Style_Enabled;
-		    if (act)
-			cflags |= Style_On;
-
-		    drawPrimitive(PE_CheckMark, p, ceData, elementFlags,
-				  TQRect(xvis, y+motifItemFrame, mw, mh),
-				  cg, cflags);
+		    drawPrimitive(PE_MenuItemIndicatorCheck, p, ceData, elementFlags, TQRect(x, y, checkcol, h), cg, flags);
 		}
 	    }
 
@@ -1339,9 +1356,10 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 	    if (sub == (SC_ScrollBarAddLine | SC_ScrollBarSubLine | SC_ScrollBarAddPage |
 			SC_ScrollBarSubPage | SC_ScrollBarFirst | SC_ScrollBarLast |
 			SC_ScrollBarSlider))
-		qDrawShadePanel(p, ceData.rect, cg, TRUE,
-				pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags, widget),
-				&cg.brush(TQColorGroup::Mid));
+		drawPrimitive(PE_PanelScrollBar, p, ceData, elementFlags, ceData.rect, cg,
+			      ((ceData.orientation == TQt::Horizontal) ?
+			      Style_Horizontal : Style_Default));
+
 	    TQCommonStyle::drawComplexControl(control, p, ceData, elementFlags, r, cg, flags, sub,
 					     subActive, opt, widget);
 	    break;