Update web pages

[imagemagick] / MagickCore / xwindow.h

diff --git a/MagickCore/xwindow.h b/MagickCore/xwindow.h
index 265a06c08e92c14579a0fe066206384adacfa7f9..f44f75f524f7ea1fcfc49bddd8524ff738ede39c 100644 (file)
--- a/MagickCore/xwindow.h
+++ b/MagickCore/xwindow.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -22,42 +22,20 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-
 typedef struct _XImportInfo
-  XImportInfo;
-
-typedef struct _XResourceInfo
-  XResourceInfo;
-
-extern MagickExport char
-  *XGetResourceClass(XrmDatabase,const char *,const char *,char *),
-  *XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
-  *XGetScreenDensity(Display *);
-
-extern MagickExport int
-  XError(Display *,XErrorEvent *);
-
-extern MagickExport XrmDatabase
-  XGetResourceDatabase(Display *,const char *);
-
-extern MagickExport void
-  XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
-  XRetainWindowColors(Display *,const Window);
-#endif
+{
+  MagickBooleanType
+    frame,
+    borders,
+    screen,
+    descend,
+    silent;
+} XImportInfo;
 
 extern MagickExport Image
-  *XImportImage(const ImageInfo *,XImportInfo *);
-
-extern MagickExport MagickBooleanType
-  XRemoteCommand(Display *,const char *,const char *);
+  *XImportImage(const ImageInfo *,XImportInfo *,ExceptionInfo *);
 
 extern MagickExport void
-  DestroyXResources(void),
-  XDestroyResourceInfo(XResourceInfo *),
   XGetImportInfo(XImportInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)