From bd62deaf71938a91ed4062526b4c6c868cadda6a Mon Sep 17 00:00:00 2001 From: vsv Date: Mon, 2 Nov 2015 16:56:11 +0300 Subject: [PATCH] Fix of Linux compilation errors --- src/XGUI/XGUI_ObjectsBrowser.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/XGUI/XGUI_ObjectsBrowser.cpp b/src/XGUI/XGUI_ObjectsBrowser.cpp index 2dfaa172f..3dccaf732 100644 --- a/src/XGUI/XGUI_ObjectsBrowser.cpp +++ b/src/XGUI/XGUI_ObjectsBrowser.cpp @@ -21,6 +21,13 @@ #include #include +#ifdef WIN32 +#ifdef HAVE_SALOME +#include +#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)"; -- 2.39.2