diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-19 22:33:10 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-19 22:33:10 -0500 |
| commit | 481457e5859adea2b83aba47b6d5d724b4c7bf24 (patch) | |
| tree | 61854d5d93e9c24c453d38dff5d2c50c198ac3fc /tdefx | |
| parent | bf94fa1cd02da4ac25a710440fc62170b5609e75 (diff) | |
| parent | fb2b1442644d0b35d004f3896efc0afa5a5b81a5 (diff) | |
| download | tdelibs-481457e5859adea2b83aba47b6d5d724b4c7bf24.tar.gz tdelibs-481457e5859adea2b83aba47b6d5d724b4c7bf24.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdefx')
| -rw-r--r-- | tdefx/kstyle.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index e9e5d2105..8720d368d 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -701,8 +701,7 @@ void KStyle::drawControl( TQ_ControlElement element, // TABS // ------------------------------------------------------------------------ case CE_TabBarTab: { - const TQTabBar* tb = (const TQTabBar*) widget; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = ceData.tabBarData.shape; bool selected = flags & Style_Selected; int x = r.x(), y=r.y(), bottom=r.bottom(), right=r.right(); @@ -1043,17 +1042,15 @@ int KStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, Control return 24; case PM_TabBarTabVSpace: { - const TQTabBar * tb = (const TQTabBar *) widget; - if ( tb->shape() == TQTabBar::RoundedAbove || - tb->shape() == TQTabBar::RoundedBelow ) + if ( ceData.tabBarData.shape == TQTabBar::RoundedAbove || + ceData.tabBarData.shape == TQTabBar::RoundedBelow ) return 10; else return 4; } case PM_TabBarTabOverlap: { - const TQTabBar* tb = (const TQTabBar*)widget; - TQTabBar::Shape tbs = tb->shape(); + TQTabBar::Shape tbs = ceData.tabBarData.shape; if ( (tbs == TQTabBar::RoundedAbove) || (tbs == TQTabBar::RoundedBelow) ) |