diff --git a/include/automation_editor.h b/include/automation_editor.h
index 339b825b6..195be1a2d 100644
--- a/include/automation_editor.h
+++ b/include/automation_editor.h
@@ -88,10 +88,6 @@ public:
 	}
 
 
-public slots:
-	virtual void update( void );
-
-
 protected:
 	typedef automationPattern::timeMap timeMap;
 
@@ -209,6 +205,7 @@ private:
 	int m_bottom_level;
 	int m_top_level;
 
+	void updatePaintPixmap( void );
 	void updateTopBottomLevels( void );
 
 	QScrollBar * m_leftRightScroll;
diff --git a/include/piano_roll.h b/include/piano_roll.h
index 04763b610..253783cc0 100644
--- a/include/piano_roll.h
+++ b/include/piano_roll.h
@@ -93,10 +93,6 @@ public:
 	}
 
 
-public slots:
-	virtual void update( void );
-
-
 protected:
 	virtual void closeEvent( QCloseEvent * _ce );
 	virtual void enterEvent( QEvent * _e );
@@ -182,6 +178,8 @@ private:
 
 	midiTime newNoteLen( void ) const;
 
+	void updatePaintPixmap( void );
+
 
 	static QPixmap * s_whiteKeyBigPm;
 	static QPixmap * s_whiteKeySmallPm;
diff --git a/src/core/automation_editor.cpp b/src/core/automation_editor.cpp
index 048c5c30a..b858ff3f4 100644
--- a/src/core/automation_editor.cpp
+++ b/src/core/automation_editor.cpp
@@ -497,7 +497,7 @@ inline void automationEditor::drawValueRect( QPainter & _p,
 
 
 
-void automationEditor::update( void )
+void automationEditor::updatePaintPixmap( void )
 {
 	if( m_paintPixmap.isNull() == TRUE || m_paintPixmap.size() != size() )
 	{
@@ -817,8 +817,6 @@ void automationEditor::update( void )
 #else
 	m_leftRightScroll->setSteps( 1, l );
 #endif
-
-	QWidget::update();
 }
 
 
@@ -1193,7 +1191,7 @@ void automationEditor::mouseMoveEvent( QMouseEvent * _me )
 
 		if( _me->x() <= VALUES_WIDTH )
 		{
-			QWidget::update();
+			update();
 			return;
 		}
 		x -= VALUES_WIDTH;
@@ -1548,20 +1546,7 @@ void automationEditor::mouseMoveEvent( QMouseEvent * _me )
 		QApplication::restoreOverrideCursor();
 	}
 
-	if(
-#ifdef QT4
-			_me->buttons() &
-#else
-			_me->state() ==
-#endif
-						Qt::NoButton )
-	{
-		QWidget::update();
-	}
-	else
-	{
-		update();
-	}
+	update();
 }
 
 
@@ -1569,6 +1554,7 @@ void automationEditor::mouseMoveEvent( QMouseEvent * _me )
 
 void automationEditor::paintEvent( QPaintEvent * )
 {
+	updatePaintPixmap();
 #ifdef QT4
 	QPainter p( this );
 #else
diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp
index ebddd56b8..526f12723 100644
--- a/src/core/piano_roll.cpp
+++ b/src/core/piano_roll.cpp
@@ -633,7 +633,7 @@ inline void pianoRoll::drawNoteRect( QPainter & _p, Uint16 _x, Uint16 _y,
 
 
 
-void pianoRoll::update( void )
+void pianoRoll::updatePaintPixmap( void )
 {
 	if( m_paintPixmap.isNull() == TRUE || m_paintPixmap.size() != size() )
 	{
@@ -982,8 +982,6 @@ void pianoRoll::update( void )
 #else
 	m_leftRightScroll->setSteps( 1, l );
 #endif
-
-	QWidget::update();
 }
 
 
@@ -1172,7 +1170,7 @@ void pianoRoll::keyPressEvent( QKeyEvent * _ke )
 				m_editMode = OPEN;
 				QApplication::setOverrideCursor(
 						QCursor( ArrowCursor ), TRUE );
-				QWidget::update();
+				update();
 			}
 
 		default:
@@ -1551,7 +1549,7 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me )
 		}
 		if( _me->x() <= WHITE_KEY_WIDTH )
 		{
-			QWidget::update();
+			update();
 			return;
 		}
 		x -= WHITE_KEY_WIDTH;
@@ -1989,20 +1987,7 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me )
 		QApplication::restoreOverrideCursor();
 	}
 
-	if(
-#ifdef QT4
-			_me->buttons() &
-#else
-			_me->state() ==
-#endif
-						Qt::NoButton )
-	{
-		QWidget::update();
-	}
-	else
-	{
-		update();
-	}
+	update();
 }
 
 
@@ -2010,6 +1995,7 @@ void pianoRoll::mouseMoveEvent( QMouseEvent * _me )
 
 void pianoRoll::paintEvent( QPaintEvent * )
 {
+	updatePaintPixmap();
 #ifdef QT4
 	QPainter p( this );
 #else