diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-08 15:30:41 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-08-08 15:30:41 -0500 |
| commit | 04a4f34bdc390b516b9e67b027a913c9c63246be (patch) | |
| tree | c6a7355ee50e92b3c58d8099a4ce43c9eb2b2175 | |
| parent | 5339ac3f519b59ab37c48f1a6a3f1184a74566d3 (diff) | |
| download | tqt3-04a4f34bdc390b516b9e67b027a913c9c63246be.tar.gz tqt3-04a4f34bdc390b516b9e67b027a913c9c63246be.zip | |
Automated update from Qt3
| -rw-r--r-- | src/kernel/ntqstyle.h | 22 | ||||
| -rw-r--r-- | src/kernel/qstyle.cpp | 24 |
2 files changed, 27 insertions, 19 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h index d15f5295..fa969485 100644 --- a/src/kernel/ntqstyle.h +++ b/src/kernel/ntqstyle.h @@ -1189,25 +1189,9 @@ public: // Old 2.x TQStyle API #ifndef QT_NO_COMPAT - int defaultFrameWidth() const - { - TQStyleControlElementData ceData; - return pixelMetric( PM_DefaultFrameWidth, ceData, CEF_None ); - } - void tabbarMetrics( const TQWidget* t, - int& hf, int& vf, int& ov ) const - { - TQStyleControlElementData ceData; - hf = pixelMetric( PM_TabBarTabHSpace, ceData, CEF_None, t ); - vf = pixelMetric( PM_TabBarTabVSpace, ceData, CEF_None, t ); - ov = pixelMetric( PM_TabBarBaseOverlap, ceData, CEF_None, t ); - } - TQSize scrollBarExtent() const - { - TQStyleControlElementData ceData; - return TQSize(pixelMetric(PM_ScrollBarExtent, ceData, CEF_None), - pixelMetric(PM_ScrollBarExtent, ceData, CEF_None)); - } + int defaultFrameWidth() const; + void tabbarMetrics( const TQWidget* t, int& hf, int& vf, int& ov ) const; + TQSize scrollBarExtent() const; #endif public: diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp index 7f239d4b..5dd32a26 100644 --- a/src/kernel/qstyle.cpp +++ b/src/kernel/qstyle.cpp @@ -2795,6 +2795,30 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp \obsolete */ +#ifndef QT_NO_COMPAT +int TQStyle::defaultFrameWidth() const +{ + TQStyleControlElementData ceData; + return pixelMetric( PM_DefaultFrameWidth, ceData, CEF_None ); +} + +void TQStyle::tabbarMetrics( const TQWidget* t, int& hf, int& vf, int& ov ) const +{ + TQStyleControlElementData ceData; + hf = pixelMetric( PM_TabBarTabHSpace, ceData, CEF_None, t ); + vf = pixelMetric( PM_TabBarTabVSpace, ceData, CEF_None, t ); + ov = pixelMetric( PM_TabBarBaseOverlap, ceData, CEF_None, t ); +} + +TQSize TQStyle::scrollBarExtent() const +{ + TQStyleControlElementData ceData; + ceData.orientation = TQt::Horizontal; + return TQSize(pixelMetric(PM_ScrollBarExtent, ceData, CEF_None), + pixelMetric(PM_ScrollBarExtent, ceData, CEF_None)); +} +#endif + TQStyleControlElementData::TQStyleControlElementData() { isNull = true; activePainter = 0; |