Re #4282. A correction for Windows

mantidproject · Jan 17, 2012 · f6a65af · f6a65af
1 parent e21f3e9
commit f6a65af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Code/Mantid/MantidPlot/src/FloatingWindow.cpp b/Code/Mantid/MantidPlot/src/FloatingWindow.cpp
@@ -17,13 +17,16 @@
  * Constructor.
  */
 FloatingWindow::FloatingWindow(ApplicationWindow* appWindow, Qt::WindowFlags f):
+#ifdef Q_OS_WIN
+QMainWindow(appWindow,f),
+#else
 QMainWindow(NULL,f),
-//QMainWindow(appWindow,f),
+#endif
 d_app(appWindow)
 {
   setFocusPolicy(Qt::StrongFocus);
   connect(appWindow,SIGNAL(shutting_down()),this,SLOT(close()));
-#ifdef _WIN32
+#ifdef Q_OS_WIN
   // remember the flags
   m_flags = windowFlags();
 #endif
@@ -74,7 +77,7 @@ bool FloatingWindow::event(QEvent * e)
   {
     if (this->isMinimized())
     {
-#ifdef _WIN32
+#ifdef Q_OS_WIN
       // set parent to NULL wich makes it minimize nicely into a program bar icon
       this->setParent(NULL);
       this->showMinimized();
@@ -84,7 +87,7 @@ bool FloatingWindow::event(QEvent * e)
     }
     else if ( !this->isMaximized() || !this->isMinimized() )
     {
-#ifdef _WIN32
+#ifdef Q_OS_WIN
       // re-parent to the main window making the floating window stay on top of it
       if (this->parent() != d_app)
       {
@@ -97,7 +100,7 @@ bool FloatingWindow::event(QEvent * e)
     }
     else if (this->isMaximized())
     {
-#ifdef _WIN32
+#ifdef Q_OS_WIN
       // re-parent to the main window making the floating window stay on top of it
       if (this->parent() != d_app)
       {

diff --git a/Code/Mantid/MantidPlot/src/FloatingWindow.h b/Code/Mantid/MantidPlot/src/FloatingWindow.h
@@ -28,7 +28,7 @@ class FloatingWindow: public QMainWindow
   QWidget* widget() const;
   virtual bool event(QEvent * e);
   ApplicationWindow* d_app; ///< Pointer to the main window
-#ifdef _WIN32
+#ifdef Q_OS_WIN
   Qt::WindowFlags m_flags;  ///< Keeps a copy of window flags, used when re-parenting
 #endif
 };