diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/ntqstyle.h | 19 | ||||
| -rw-r--r-- | src/kernel/qstyle.cpp | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index 90f4eacff..73543dd99 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -202,6 +202,9 @@ class TQStyleControlElementGenericWidgetData { TQPixmap icon; TQPalette palette; TQFont font; + TQColor paletteBgColor; + TQString name; + TQString caption; }; class TQStyleControlElementTabBarData { @@ -276,6 +279,13 @@ class Q_EXPORT TQStyleControlElementData { TQRect sliderRect; TQPainter* activePainter; TQStyleControlElementToolBarWidgetData toolBarData; + TQ_UINT32 comboBoxListBoxFlags; + TQColor paletteBgColor; + TQ_UINT32 parentWidgetFlags; + TQString name; + TQString caption; + TQStyleControlElementGenericWidgetData topLevelWidgetData; + TQ_UINT32 topLevelWidgetFlags; public: TQStyleControlElementData(); @@ -339,6 +349,7 @@ public: CEF_IsActiveWindow = 0x00200000, CEF_IsTopLevel = 0x00400000, CEF_IsVisible = 0x00800000, + CEF_IsShown = 0x01000000, CEF_HasMouse = 0x01000000 }; @@ -469,6 +480,8 @@ public: PE_MenuItemIndicatorIconFrame, PE_MenuItemIndicatorCheck, + PE_ScrollBarTrough, + // do not add any values below/greater this PE_CustomBase = 0xf000000 }; @@ -1050,6 +1063,12 @@ public: // int - width of menu check column SH_MenuIndicatorColumnWidth, + // bool - whether or not the lower two button drawing areas should be combined into one + SH_ScrollBar_CombineAddLineRegionDrawingAreas, + + // bool - whether or not the upper two button drawing areas should be combined into one + SH_ScrollBar_CombineSubLineRegionDrawingAreas, + // do not add any values below/greater than this SH_CustomBase = 0xf0000000 }; diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index ef31c25ca..f32d73b9a 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2606,6 +2606,12 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp TQStyleControlElementData::TQStyleControlElementData() { activePainter = 0; + tickMarkSetting = 0; + comboBoxLineEditFlags = 0; + frameStyle = 0; + comboBoxListBoxFlags = 0; + parentWidgetFlags = 0; + topLevelWidgetFlags = 0; } #endif // QT_NO_STYLE |