]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Fix of Linux compilation errors
authorvsv <vitaly.smetannikov@opencascade.com>
Mon, 2 Nov 2015 13:56:11 +0000 (16:56 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Mon, 2 Nov 2015 13:56:11 +0000 (16:56 +0300)
src/XGUI/XGUI_ObjectsBrowser.cpp

index 2dfaa172f06d2cf4fef1ce0ffc02e9868b25d832..3dccaf732679a81b3b00dcd5e219d0201bb2bb86 100644 (file)
 #include <QStyledItemDelegate>
 #include <QMessageBox>
 
+#ifdef WIN32
+#ifdef HAVE_SALOME
+#include <QWindowsStyle>
+#endif
+#endif
+
+
 /// Width of second column (minimum acceptable = 27)
 #define SECOND_COL_WIDTH 30
 
@@ -61,11 +68,13 @@ private:
 XGUI_DataTree::XGUI_DataTree(QWidget* theParent)
     : QTreeView(theParent)
 {
-#if (!defined HAVE_SALOME) && (defined WIN32)
+#ifdef WIN32
+#ifdef HAVE_SALOME
+  setStyle(new QWindowsStyle());
+#else
   myStyle = new XGUI_TreeViewStyle();
   setStyle(myStyle);
-#else
-  setStyle(new QWindowsStyle());
+#endif
 #endif
 
   setHeaderHidden(true);
@@ -235,6 +244,7 @@ void XGUI_ActiveDocLbl::setTreeView(QTreeView* theView)
   QString aName = aPalet.color(QPalette::Base).name();
   myNeutralStyle = "QLineEdit { border: 1px solid " + aName + " }";
 
+
 #if (!defined HAVE_SALOME) && (defined WIN32)
   mySelectionStyle = "QLineEdit {background-color: ";
   mySelectionStyle += "qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgb(236, 245, 255)";