Always enable photo shape source functionality

Remove unneeded includes, macros, and configure checks

Author: chrstphrchvz

generic/shape.c

@@ -11,17 +11,6 @@
 
 #include "shapeInt.h"
 
-#ifdef __WIN32__
-#define SUPPORTS_PHOTO_REGION
-#else
-#if (SHAPE_PHOTO == 1)
-#define SUPPORTS_PHOTO_REGION
-#endif
-#endif
-
-#ifdef SUPPORTS_PHOTO_REGION
-#include <tkInt.h>
-#endif
 #include <X11/Xutil.h>
 
 #define min(x,y)	((x)<(y) ? (x) : (y))
@@ -55,12 +44,9 @@ static int		shapeText(Tk_Window tkwin, Tcl_Interp *interp,
 static int		shapeWindow(Tk_Window tkwin, Tcl_Interp *interp,
 			    int x, int y, int op, int kind, int objc,
 			    Tcl_Obj *const objv[]);
-#ifdef SUPPORTS_PHOTO_REGION
 static int		shapePhoto(Tk_Window tkwin, Tcl_Interp *interp,
 			    int x, int y, int op, int kind, int objc,
 			    Tcl_Obj *const objv[]);
-#endif
-
 static int		shapeCmd(ClientData clientData, Tcl_Interp *interp,
 			    int objc, Tcl_Obj *const objv[]);
 
@@ -379,7 +365,6 @@ shapeWindow(
     return Shape_CombineWindow(interp, tkwin, kind, op, x, y, srcwin);
 }
 
-#ifdef SUPPORTS_PHOTO_REGION
 static int
 shapePhoto(
     Tk_Window tkwin,
@@ -469,7 +454,6 @@ shapePhoto(
     Tk_FreePixmap(dpy, maskDrawable);
     return result;
 }
-#endif
 
 static int
 shapeSetUpdateOps(
@@ -486,25 +470,19 @@ shapeSetUpdateOps(
 	"-offset",
 	"-bounding", "-clip", "-both",
 	"bitmap", "rectangles", "reset", "text", "window",
-#ifdef SUPPORTS_PHOTO_REGION
 	"photo",
-#endif
 	NULL
     };
     static enum optkind optk[] = {
 	offsetargs,
 	shapekind, shapekind, shapekind,
 	sourceargs, sourceargs, sourceargs, sourceargs, sourceargs
-#ifdef SUPPORTS_PHOTO_REGION
 	, sourceargs
-#endif
     };
     static shapeApplicator applicators[] = {
 	NULL, NULL, NULL, NULL,
 	shapeBitmap, shapeRects, shapeReset, shapeText, shapeWindow,
-#ifdef SUPPORTS_PHOTO_REGION
 	shapePhoto,
-#endif
 	NULL
     };
 

unix/Makefile.in

@@ -50,7 +50,7 @@ GENERIC_DIR		= $(TOP_DIR)/generic
 UNIX_DIR		= $(TOP_DIR)/unix
 INCLUDE_DIR		= $(TOP_DIR)/include
 # ----------------------------------------------------------------------
-CFLAGS = -g -DSHAPE_PHOTO=@SHAPE_PHOTO@
+CFLAGS = -g
 CC_SWITCHES = $(CFLAGS) ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 	-I${INCLUDE_DIR} -I${GENERIC_DIR} -I${UNIX_DIR} \
 	-I${TK_INCLUDE_DIR} ${TK_XINCLUDES} -I${TCL_INCLUDE_DIR} \

unix/configure

@@ -492,52 +492,6 @@ else
 fi
 
 
-echo $ac_n "checking for TkPhotoGetValidRegion""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_TkPhotoGetValidRegion'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 501 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char TkPhotoGetValidRegion(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-char TkPhotoGetValidRegion(); 
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_TkPhotoGetValidRegion) || defined (__stub___TkPhotoGetValidRegion)
-choke me
-#else
-TkPhotoGetValidRegion();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
-  rm -rf conftest*
-  eval "ac_cv_func_TkPhotoGetValidRegion=yes"
-else
-  rm -rf conftest*
-  eval "ac_cv_func_TkPhotoGetValidRegion=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'TkPhotoGetValidRegion`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SHAPE_PHOTO=1
-else
-  echo "$ac_t""no" 1>&6
-SHAPE_PHOTO=0
-fi
-
-
 
 if test $TCL_SHARED_BUILD -eq 1; then
     PRIMARY_TARGET='$(SOFILE)'
@@ -679,7 +633,6 @@ s%@LIBS@%$LIBS%g
 s%@exec_prefix@%$exec_prefix%g
 s%@prefix@%$prefix%g
 s%@program_transform_name@%$program_transform_name%g
-s%@SHAPE_PHOTO@%$SHAPE_PHOTO%g
 s%@CC@%$CC%g
 s%@PRIMARY_TARGET@%$PRIMARY_TARGET%g
 s%@SHLIB_CFLAGS@%$SHLIB_CFLAGS%g

unix/configure.in

@@ -65,9 +65,6 @@ TCL_BIN_DIR=$TK_EXEC_PREFIX/bin
 
 AC_CHECK_LIB(Xext, XShapeQueryVersion, :, AC_MSG_ERROR(X extension library not available), $TK_XLIBSW)
 
-AC_CHECK_FUNC(TkPhotoGetValidRegion, SHAPE_PHOTO=1, SHAPE_PHOTO=0)
-AC_SUBST(SHAPE_PHOTO)
-
 if test $TCL_SHARED_BUILD -eq 1; then
     PRIMARY_TARGET='$(SOFILE)'
 else