From e45c3073a052540d6f24b5425ac54a36bd532a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Wed, 7 May 2008 17:08:17 +0000
Subject: [PATCH] Sync r803670 from oxygen.

svn path=/trunk/KDE/kdebase/workspace/; revision=805133
---
 clients/ozone/oxygenbutton.cpp | 3 +++
 clients/ozone/oxygenclient.cpp | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/clients/ozone/oxygenbutton.cpp b/clients/ozone/oxygenbutton.cpp
index 00938d3955..ba2045c4d7 100644
--- a/clients/ozone/oxygenbutton.cpp
+++ b/clients/ozone/oxygenbutton.cpp
@@ -158,6 +158,9 @@ void OxygenButton::paintEvent(QPaintEvent *)
     QPainter painter(this);
     QPalette pal = palette(); // de-const-ify
 
+
+    helper_.renderWindowBackground(&painter, this->rect(), this);
+
     if (type_ == ButtonMenu) {
         // we paint the mini icon (which is 16 pixels high)
         int dx = (width() - 16) / 2;
diff --git a/clients/ozone/oxygenclient.cpp b/clients/ozone/oxygenclient.cpp
index 1a5cbd25e3..89fa3ec8a2 100644
--- a/clients/ozone/oxygenclient.cpp
+++ b/clients/ozone/oxygenclient.cpp
@@ -91,10 +91,6 @@ void OxygenClient::init()
 
     widget()->setAutoFillBackground(false);
     widget()->setAttribute(Qt::WA_OpaquePaintEvent);
-#ifdef __GNUC__
-#warning This wastes quite a lot of memory.
-#endif
-    widget()->setAttribute(Qt::WA_PaintOnScreen, false);
 }
 
 bool OxygenClient::decorationBehaviour(DecorationBehaviour behaviour) const