Commit 273ba284 authored by whitlocb's avatar whitlocb

I fixed zoom and lineout rubberband lines.



git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@8038 18c085ea-50e0-402c-830e-de6fd14e8384
parent b6fab2b5
......@@ -11088,7 +11088,7 @@ fi
X_CPPFLAGS="-DHAVE_XLIB"
else
X_LIBS=""
X_CPPFLAGS="-DHAVE_XLIB"
X_CPPFLAGS=""
fi
......
......@@ -3482,7 +3482,7 @@ if test "$no_x" != "yes"; then
X_CPPFLAGS="-DHAVE_XLIB"
else
X_LIBS=""
X_CPPFLAGS="-DHAVE_XLIB"
X_CPPFLAGS=""
fi
AC_SUBST(X_LIBS)
AC_SUBST(X_CPPFLAGS)
......
......@@ -60,7 +60,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <windows.h>
#elif defined(__APPLE__)
#include <Carbon/Carbon.h>
#elif defined(HAVE_X11)
#elif defined(HAVE_XLIB)
#include <X11/Intrinsic.h>
#endif
......@@ -315,7 +315,7 @@ void vtkDashedXorGridMapper2D::RenderOverlay(vtkViewport* viewport, vtkActor2D*
r.size.height = info->h;
CGContextClearRect(overlay->ctx, r);
#elif defined(HAVE_X11)
#elif defined(HAVE_XLIB)
//
// X11 coding and macros
//
......@@ -375,7 +375,7 @@ void vtkDashedXorGridMapper2D::RenderOverlay(vtkViewport* viewport, vtkActor2D*
SET_FOREGROUND_D(actorColor);
#endif
#if defined(_WIN32) || defined(__APPLE__) || defined(HAVE_X11)
#if defined(_WIN32) || defined(__APPLE__) || defined(HAVE_XLIB)
int numPts;
vtkPolyData *input= vtkPolyData::SafeDownCast(this->GetInput());
vtkIdType npts, *pts;
......
......@@ -58,7 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <windows.h>
#elif defined(__APPLE__)
#include <Carbon/Carbon.h>
#elif defined(HAVE_X11)
#elif defined(HAVE_XLIB)
#include <X11/Intrinsic.h>
#endif
......@@ -358,7 +358,7 @@ CGContextMoveToPoint(overlay->ctx, X,H-(Y));
// Free the info that we received from the vtkQt window.
delete info;
#elif defined(HAVE_X11)
#elif defined(HAVE_XLIB)
// ***************************************************************************
//
// X11 coding and macros
......@@ -437,7 +437,7 @@ CGContextMoveToPoint(overlay->ctx, X,H-(Y));
SET_FOREGROUND_D(actorColor);
#endif
#if defined(_WIN32) || defined(_APPLE__) || defined(HAVE_X11)
#if defined(_WIN32) || defined(__APPLE__) || defined(HAVE_XLIB)
int numPts;
vtkPolyData *input= vtkPolyData::SafeDownCast(this->GetInput());
vtkIdType npts, *pts;
......
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