Integrate Mac window event code with 'Show composer maps on demand'

telwertowski · telwertowski · commit 6062bb587a2c · 2011-05-16T12:25:31.000-04:00
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:

Original file line number	Diff line number	Diff line change
`@@ -371,16 +371,6 @@ void QgsComposer::changeEvent( QEvent* event )`
`371`	`371`	`break;`
`372`	`372`	`}`
`373`	`373`	`}`
`374`		`-`
`375`		`-void QgsComposer::showEvent( QShowEvent *event )`
`376`		`-{`
`377`		`- QMainWindow::showEvent( event );`
`378`		`- // add to menu if (re)opening window (event not due to unminimize)`
`379`		`- if ( !event->spontaneous() )`
`380`		`- {`
`381`		`- QgisApp::instance()->addWindow( mWindowAction );`
`382`		`- }`
`383`		`-}`
`384`	`374`	`#endif`
`385`	`375`
`386`	`376`	`void QgsComposer::setTitle( const QString& title )`
`@@ -1137,6 +1127,14 @@ void QgsComposer::showEvent( QShowEvent* event )`
`1137`	`1127`	`}`
`1138`	`1128`	`mMapsToRestore.clear();`
`1139`	`1129`	`}`
	`1130`	`+`
	`1131`	`+#ifdef Q_WS_MAC`
	`1132`	`+ // add to menu if (re)opening window (event not due to unminimize)`
	`1133`	`+ if ( !event->spontaneous() )`
	`1134`	`+ {`
	`1135`	`+ QgisApp::instance()->addWindow( mWindowAction );`
	`1136`	`+ }`
	`1137`	`+#endif`
`1140`	`1138`	`}`
`1141`	`1139`
`1142`	`1140`	`void QgsComposer::saveWindowState()`