Merge pull request #21 from telwertowski/master

Integrate Mac window event code with 'Show composer maps on demand'
qgis · May 16, 2011 · 72b6cd1 · 72b6cd1
2 parents 6de875a + 6062bb5
commit 72b6cd1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -371,16 +371,6 @@ void QgsComposer::changeEvent( QEvent* event )
       break;
   }
 }
-
-void QgsComposer::showEvent( QShowEvent *event )
-{
-  QMainWindow::showEvent( event );
-  // add to menu if (re)opening window (event not due to unminimize)
-  if ( !event->spontaneous() )
-  {
-    QgisApp::instance()->addWindow( mWindowAction );
-  }
-}
 #endif
 
 void QgsComposer::setTitle( const QString& title )
@@ -1137,6 +1127,14 @@ void QgsComposer::showEvent( QShowEvent* event )
     }
     mMapsToRestore.clear();
   }
+
+#ifdef Q_WS_MAC
+  // add to menu if (re)opening window (event not due to unminimize)
+  if ( !event->spontaneous() )
+  {
+    QgisApp::instance()->addWindow( mWindowAction );
+  }
+#endif
 }
 
 void QgsComposer::saveWindowState()

diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
@@ -97,9 +97,6 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 #ifdef Q_WS_MAC
     //! Change event (update window menu on ActivationChange)
     virtual void changeEvent( QEvent * );
-
-    //! Show event (add window to menu)
-    virtual void showEvent( QShowEvent * );
 #endif
 
   signals: