Commit 0ae9624b authored by bonnell's avatar bonnell
Browse files

re-enable rubber band modes with QT 5 on X11.

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@31380 18c085ea-50e0-402c-830e-de6fd14e8384
parent 89612011
......@@ -67,6 +67,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(HAVE_XLIB)
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
# include <QX11Info>
#else
# include <QtX11Extras/QX11Info>
#endif
# include <X11/Intrinsic.h>
#endif
......@@ -291,7 +293,6 @@ vtkDashedXorGridMapper2D::RenderOverlay(vtkViewport* viewport, vtkActor2D* actor
void
vtkDashedXorGridMapper2D::RenderOverlay_X11(vtkViewport* viewport, vtkActor2D* actor)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#if defined(HAVE_XLIB)
#define SET_FOREGROUND_D(rgba) \
aColor.red = (unsigned short) (rgba[0] * 65535.0); \
......@@ -349,7 +350,6 @@ vtkDashedXorGridMapper2D::RenderOverlay_X11(vtkViewport* viewport, vtkActor2D* a
#include <vtkDashedXorGridMapper2D_body.C>
#endif
#endif
}
// ****************************************************************************
......
......@@ -64,6 +64,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if defined(HAVE_XLIB)
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
# include <QX11Info>
#else
# include <QtX11Extras/QX11Info>
#endif
# include <X11/Intrinsic.h>
#endif
......@@ -284,7 +286,6 @@ vtkRubberBandMapper2D::RenderOverlay(vtkViewport* viewport, vtkActor2D* actor)
void
vtkRubberBandMapper2D::RenderOverlay_X11(vtkViewport* viewport, vtkActor2D* actor)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#if defined(HAVE_XLIB)
#define STORE_POINT(P, X, Y) P.x = short(X); P.y = short(Y);
......@@ -359,7 +360,6 @@ vtkRubberBandMapper2D::RenderOverlay_X11(vtkViewport* viewport, vtkActor2D* acto
#include <vtkRubberBandMapper2D_body.C>
#endif
#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