Commit e120f920 authored by bonnell's avatar bonnell
Browse files

Re-enable WindowMetrics::CalculateBorders and CalculateTopLeft for QT 5 & X11

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31492 18c085ea-50e0-402c-830e-de6fd14e8384
parent 8e01c39c
...@@ -494,7 +494,6 @@ WindowMetrics::CalculateBorders(QWidget *win, ...@@ -494,7 +494,6 @@ WindowMetrics::CalculateBorders(QWidget *win,
int &borderT, int &borderB, int &borderT, int &borderB,
int &borderL, int &borderR) int &borderL, int &borderR)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
unsigned int nchildren; unsigned int nchildren;
Window root, parent_window, *children=NULL; Window root, parent_window, *children=NULL;
XWindowAttributes leaf_attributes; XWindowAttributes leaf_attributes;
...@@ -601,7 +600,6 @@ WindowMetrics::CalculateBorders(QWidget *win, ...@@ -601,7 +600,6 @@ WindowMetrics::CalculateBorders(QWidget *win,
if (borderL < 0) borderL = 0; if (borderL < 0) borderL = 0;
if (borderR < 0) borderR = 0; if (borderR < 0) borderR = 0;
} }
#endif
} }
// **************************************************************************** // ****************************************************************************
...@@ -691,7 +689,6 @@ WindowMetrics::WaitForWindowManagerToMoveWindow(QWidget *win) ...@@ -691,7 +689,6 @@ WindowMetrics::WaitForWindowManagerToMoveWindow(QWidget *win)
void void
WindowMetrics::CalculateTopLeft(QWidget *wid, int &X, int &Y) WindowMetrics::CalculateTopLeft(QWidget *wid, int &X, int &Y)
{ {
#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
Window root, parent; Window root, parent;
XWindowAttributes atts; XWindowAttributes atts;
...@@ -717,7 +714,6 @@ WindowMetrics::CalculateTopLeft(QWidget *wid, int &X, int &Y) ...@@ -717,7 +714,6 @@ WindowMetrics::CalculateTopLeft(QWidget *wid, int &X, int &Y)
XGetWindowAttributes(dpy, window, &atts); XGetWindowAttributes(dpy, window, &atts);
X = atts.x; X = atts.x;
Y = atts.y; Y = atts.y;
#endif
} }
// **************************************************************************** // ****************************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment