uiuiui - fixed a bug which let running applications crash if switched style

from phase to any other. Reason was that in phase-style a special menubaritem-
drawroutine was set but not RESET to qte default if this style was removed
I'd implemented the unPolish routine and just set this callback to 0 (qt-default)
and now it works nice.

2 files changed, 15 insertions, 3 deletions

diff --git a/noncore/styles/phase/phasestyle.cpp b/noncore/styles/phase/phasestyle.cpp
index ba8c460..906ccee 100644
--- a/noncore/styles/phase/phasestyle.cpp
+++ b/noncore/styles/phase/phasestyle.cpp
@@ -318,6 +318,11 @@ void PhaseStyle::polish( QWidget* widget ) {
 #endif
 }
 
+void PhaseStyle::unPolish( QWidget *w )
+{
+    QWindowsStyle::unPolish( w );
+}
+
 void PhaseStyle::polish( QPalette &pal ) {
     QWindowsStyle::polish( pal );
     // lighten up a bit, so the look is not so "crisp"
@@ -337,6 +342,11 @@ void PhaseStyle::polish( QApplication* app ) {
     qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl)&PhaseStyle::drawMenuBarItem);
 }
 
+void PhaseStyle::unPolish( QApplication* app ) {
+    QWindowsStyle::unPolish(app);
+    qt_set_draw_menu_bar_impl ( 0 );
+}
+
 void PhaseStyle::drawPushButtonLabel (QPushButton *button, QPainter *painter) {
     bool active = button->isOn() || button->isDown();
     QRect r = pushButtonContentsRect( button );
diff --git a/noncore/styles/phase/phasestyle.h b/noncore/styles/phase/phasestyle.h
index cbaa534..ae53efe 100644
--- a/noncore/styles/phase/phasestyle.h
+++ b/noncore/styles/phase/phasestyle.h
@@ -40,9 +40,11 @@ public:
     PhaseStyle();
     virtual ~PhaseStyle();
 
-    void polish( QWidget * );
-    void polish( QPalette& );
-    void polish( QApplication* );
+    virtual void polish( QWidget * );
+    virtual void polish( QPalette& );
+    virtual void polish( QApplication* a);
+    virtual void unPolish( QWidget * );
+    virtual void unPolish(QApplication *a);
 
 
     void drawCheckMark ( QPainter * p, int x, int y, int w,