summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-11 16:58:48 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-11 16:58:48 -0500
commit6b8b3815db7f0f8b9d53276cb97fad13305491dc (patch)
treec73e0ab22b73acf4ad2c8188b5159dc15ce941aa
parent33875614a6eddef3a881601a00ea0427e6c55003 (diff)
downloadtqt3-6b8b3815db7f0f8b9d53276cb97fad13305491dc.tar.gz
tqt3-6b8b3815db7f0f8b9d53276cb97fad13305491dc.zip
Automated update from Qt3
-rw-r--r--src/styles/qcompactstyle.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index 97f6aca86..30f219ed0 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -84,6 +84,7 @@ static const int motifCheckMarkHMargin = 1; // horiz. margins of check mark
static const int windowsRightBorder = 8; // right border on windows
static const int windowsCheckMarkWidth = 2; // checkmarks width on windows
+#if 0
static int extraPopupMenuItemWidth( bool checkable, int maxpmw, TQMenuItem* mi, const TQFontMetrics& /*fm*/ )
{
int w = 2*motifItemHMargin + 2*motifItemFrame; // a little bit of border can never harm
@@ -132,12 +133,13 @@ static int popupMenuItemHeight( bool /*checkable*/, TQMenuItem* mi, const TQFont
h = TQMAX( h, mi->custom()->sizeHint().height() + 2*motifItemVMargin + 2*motifItemFrame ) - 1;
return h;
}
+#endif
-void drawPopupMenuItem( TQPainter* p, bool checkable,
- int maxpmw, int tab, TQMenuItem* mi,
- const TQPalette& pal, bool act,
- bool enabled,
- int x, int y, int w, int h)
+void drawPopupMenuItem( TQPainter*, bool,
+ int, int, TQMenuItem*,
+ const TQPalette&, bool,
+ bool,
+ int, int, int, int)
{
}
@@ -149,7 +151,7 @@ void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleC
switch ( element ) {
case CE_PopupMenuItem:
{
- if (! (elementFlags & CEF_HasWidget) || opt.isDefault())
+ if ( (elementFlags & CEF_UseGenericParameters) || opt.isDefault())
break;
TQMenuItem *mi = opt.menuItem();
@@ -234,7 +236,7 @@ void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleC
if (act)
cflags |= Style_On;
- drawPrimitive( PE_CheckMark, p, TQRect(x + motifItemFrame + 2, y + motifItemFrame,
+ drawPrimitive( PE_CheckMark, p, ceData, elementFlags, TQRect(x + motifItemFrame + 2, y + motifItemFrame,
mw, mh), itemg, cflags, opt );
}
}
@@ -301,10 +303,10 @@ void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleC
white, white,
dis ? discol : white,
discol, white );
- drawPrimitive(PE_ArrowRight, p, TQRect(x+w - motifArrowHMargin - motifItemFrame - dim, y + h / 2 - dim / 2, dim, dim),
+ drawPrimitive(PE_ArrowRight, p, ceData, elementFlags, TQRect(x+w - motifArrowHMargin - motifItemFrame - dim, y + h / 2 - dim / 2, dim, dim),
g2, Style_Enabled);
} else {
- drawPrimitive(PE_ArrowRight, p, TQRect(x+w - motifArrowHMargin - motifItemFrame - dim, y + h / 2 - dim / 2, dim, dim),
+ drawPrimitive(PE_ArrowRight, p, ceData, elementFlags, TQRect(x+w - motifArrowHMargin - motifItemFrame - dim, y + h / 2 - dim / 2, dim, dim),
g, !dis ? Style_Enabled : Style_Default);
}
}