diff options
Diffstat (limited to 'examples/widgets/widgets')
-rw-r--r-- | examples/widgets/widgets/styles/norwegianwoodstyle.cpp | 17 | ||||
-rw-r--r-- | examples/widgets/widgets/styles/norwegianwoodstyle.h | 6 |
2 files changed, 14 insertions, 9 deletions
diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp index b8a677b9fa..9fe3d39be2 100644 --- a/examples/widgets/widgets/styles/norwegianwoodstyle.cpp +++ b/examples/widgets/widgets/styles/norwegianwoodstyle.cpp @@ -42,6 +42,11 @@ #include "norwegianwoodstyle.h" +NorwegianWoodStyle::NorwegianWoodStyle() : + QProxyStyle(QStyleFactory::create("windows")) +{ +} + //! [0] void NorwegianWoodStyle::polish(QPalette &palette) { @@ -112,9 +117,9 @@ int NorwegianWoodStyle::pixelMetric(PixelMetric metric, case PM_ComboBoxFrameWidth: return 8; case PM_ScrollBarExtent: - return QWindowsStyle::pixelMetric(metric, option, widget) + 4; + return QProxyStyle::pixelMetric(metric, option, widget) + 4; default: - return QWindowsStyle::pixelMetric(metric, option, widget); + return QProxyStyle::pixelMetric(metric, option, widget); } } //! [8] @@ -131,7 +136,7 @@ int NorwegianWoodStyle::styleHint(StyleHint hint, const QStyleOption *option, case SH_EtchDisabledText: return int(true); default: - return QWindowsStyle::styleHint(hint, option, widget, returnData); + return QProxyStyle::styleHint(hint, option, widget, returnData); } } //! [10] @@ -256,7 +261,7 @@ void NorwegianWoodStyle::drawPrimitive(PrimitiveElement element, //! [32] //! [33] default: //! [33] //! [34] - QWindowsStyle::drawPrimitive(element, option, painter, widget); + QProxyStyle::drawPrimitive(element, option, painter, widget); } } //! [34] @@ -284,11 +289,11 @@ void NorwegianWoodStyle::drawControl(ControlElement element, } } } - QWindowsStyle::drawControl(element, &myButtonOption, painter, widget); + QProxyStyle::drawControl(element, &myButtonOption, painter, widget); } break; default: - QWindowsStyle::drawControl(element, option, painter, widget); + QProxyStyle::drawControl(element, option, painter, widget); } } //! [36] diff --git a/examples/widgets/widgets/styles/norwegianwoodstyle.h b/examples/widgets/widgets/styles/norwegianwoodstyle.h index 84ace3b7a8..e8bb0fb096 100644 --- a/examples/widgets/widgets/styles/norwegianwoodstyle.h +++ b/examples/widgets/widgets/styles/norwegianwoodstyle.h @@ -41,7 +41,7 @@ #ifndef NORWEGIANWOODSTYLE_H #define NORWEGIANWOODSTYLE_H -#include <QWindowsStyle> +#include <QProxyStyle> #include <QPalette> QT_BEGIN_NAMESPACE @@ -49,12 +49,12 @@ class QPainterPath; QT_END_NAMESPACE //! [0] -class NorwegianWoodStyle : public QWindowsStyle +class NorwegianWoodStyle : public QProxyStyle { Q_OBJECT public: - NorwegianWoodStyle() {} + NorwegianWoodStyle(); void polish(QPalette &palette); void polish(QWidget *widget); |