Fix GroupBox painting on Windows when not using widgets

This is simply removing some slow and rather ugly hacks that tried
to reconstruct broken data from the windows xp theme. After testing
without these hacks on both XP and Windows 7, I believe we can
conclude that these workarounds are no longer required and even
breaks our look and feel in several places.

Task-number: QTBUG-29888
Change-Id: Ifaffd660e8d9ed6dfd43657745c3fa1606d33a7c
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/src/widgets/styles/qwindowsxpstyle_p_p.h b/src/widgets/styles/qwindowsxpstyle_p_p.h
index 783adc3085..27d9c9acc9 100644
--- a/src/widgets/styles/qwindowsxpstyle_p_p.h
+++ b/src/widgets/styles/qwindowsxpstyle_p_p.h
@@ -274,12 +274,11 @@ struct ThemeMapData {
 
     bool dataValid         : 1; // Only used to detect if hash value is ok
     bool partIsTransparent : 1;
-    bool hasAnyData        : 1; // False = part & state has not data, NOP
     bool hasAlphaChannel   : 1; // True =  part & state has real Alpha
     bool wasAlphaSwapped   : 1; // True =  alpha channel needs to be swapped
     bool hadInvalidAlpha   : 1; // True =  alpha channel contained invalid alpha values
 
-    ThemeMapData() : dataValid(false), partIsTransparent(false), hasAnyData(false),
+    ThemeMapData() : dataValid(false), partIsTransparent(false),
                      hasAlphaChannel(false), wasAlphaSwapped(false), hadInvalidAlpha(false) {}
 };
 
@@ -339,7 +338,6 @@ public:
     void drawBackgroundThruNativeBuffer(XPThemeData &themeData);
     void drawBackgroundDirectly(XPThemeData &themeData);
 
-    bool hasAnyData(const QRect &rect);
     bool hasAlphaChannel(const QRect &rect);
     bool fixAlphaChannel(const QRect &rect);
     bool swapAlphaChannel(const QRect &rect, bool allPixels = false);