Merge pull request #383 from Don-Ward/Remove-MacGraph-Take2

Remove MacGraph configuration.
uniconproject · Mar 9, 2024 · 5ef26d0 · 5ef26d0
2 parents b71f756 + cda7fd3
commit 5ef26d0
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 2,422 deletions.
diff --git a/doc/ib/appH.tex b/doc/ib/appH.tex
@@ -271,8 +271,8 @@ \chapter{Glossary of Defined Symbols}
 LONG64 & IU & C compiler's long is 64 bits (xpm) \\
 LoopThreshold & U & number of tended var initializations iconc will unroll \\
 M\_PI & IU & constant value of Pi \\
-MacGraph & U & build graphics using (legacy pre OSX) Mac graphics (should delete)  \\
-MACGRAPH\_H & IU & macgraph.h has been included \\
+{\gr MacGraph} & {\gr U} &{\gr  build graphics using (legacy pre OSX) Mac graphics (should delete)}  \\
+{\gr MACGRAPH\_H} & {\gr IU} & {\gr macgraph.h has been included} \\
 {\gr MACINTOSH} & {\gr all} & {\gr build on legacy Mac platform (delete?)}  \\
 MacOS & U & build on modern UNIX-based Mac platform \\
 max & all & compute maximum of x and y \\

diff --git a/src/h/config.h b/src/h/config.h
@@ -428,15 +428,8 @@
       #define ConsoleWindow 1
    #endif                               /* NTConsole */
    #endif                                       /* MSWindows */
-
-   #ifdef MacGraph
-   #undef Graphics
-   #define Graphics 1
-   #endif                                       /* MacGraph */
 #endif
 
-
-
 #ifdef Graphics
    #ifndef NoXpmFormat
       #if UNIX
@@ -446,10 +439,8 @@
    #endif                               /* NoXpmFormat */
 
    #ifndef MSWindows
-         #ifndef MacGraph
-            #undef XWindows
-            #define XWindows 1
-         #endif                         /* MacGraph */
+         #undef XWindows
+         #define XWindows 1
    #endif                               /* MSWindows */
 
    #undef LineCodes
@@ -1026,3 +1017,7 @@ Deliberate Syntax Error
 #if defined(MACINTOSH)
 #error The MACINTOSH configuration option is no longer supported (since 7 Mar 2024)
 #endif                                  /* MACINTOSH */
+
+#if defined(MacGraph)
+#error The MacGraph configuration option is no longer supported (since 8 Mar 2024)
+#endif                                  /* MacGraph */
diff --git a/src/h/graphics.h b/src/h/graphics.h
@@ -4,10 +4,6 @@
 
 #define MAXDISPLAYNAME  128
 
-#ifdef MacGraph
-   #include "::h:macgraph.h"
-#endif                                  /* MacGraph */
-
 #ifdef XWindows
    #include "../h/xwin.h"
 #endif                                  /* XWindows */
@@ -241,12 +237,6 @@ typedef struct _wfont {
   char          type;
   int           size;
   void          *fonts;
-#ifdef MacGraph
-  short     fontNum;
-  Style     fontStyle;
-  int       fontSize;
-  FontInfo  fInfo;                      /* I-173 */
-#endif                                  /* MacGraph */
 #ifdef XWindows
   char        * name;                   /* name for WAttrib and fontsearch */
   int           ascent;                 /* font dimensions */
@@ -323,25 +313,6 @@ struct imgmem {
 #define PCH2 ','                        /* punctuation character */
 
 
-#ifdef MacGraph
-typedef struct _wctype {
-   Pattern bkPat;
-   Pattern fillPat;
-   Point pnLoc;
-   Point pnSize;
-   short pnMode;
-   Pattern pnPat;
-   short txFont;
-   Style txFace;
-   short txMode;
-   short txSize;
-   Fixed spExtra;
-   RGBColor fgColor;
-   RGBColor bgColor;
-} ContextType, *ContextPtrType;
-#endif                                  /* MacGraph */
-
-
 /*
  * Texture management requires that we be able to lookup and reuse
  * existing textures, as well as support dynamic window-based textures.
@@ -460,9 +431,6 @@ typedef struct _wcontext {
   int           leading;                /* inter-line leading */
 #endif                                  /* GraphicsGL */
 
-#ifdef MacGraph
-  ContextPtrType   contextPtr;
-#endif                                  /* MacGraph */
   wdp           display;
 #ifdef XWindows
   GC            gc;                     /* X graphics context */
@@ -598,19 +566,6 @@ typedef struct _wstate {
   struct descrip filep, listp;          /* icon values for this window */
   struct wbind_list *children;
   struct _wbinding *parent;
-#ifdef MacGraph
-  WindowPtr theWindow;      /* pointer to the window */
-  PicHandle windowPic;      /* handle to backing pixmap */
-  GWorldPtr offScreenGWorld;  /* offscreen graphics world */
-  CGrafPtr   origPort;
-  GDHandle  origDev;
-  PixMapHandle offScreenPMHandle;
-  Rect      sourceRect;
-  Rect      destRect;
-  Rect      GWorldRect;
-  Boolean   lockOK;
-  Boolean   visible;
-#endif                                  /* MacGraph */
   wdp           display;
 
 #ifdef GraphicsGL
@@ -708,20 +663,6 @@ struct wbind_list {
   struct wbind_list *next;
 };
 
-#ifdef MacGraph
-typedef struct
-   {
-   Boolean wasDown;
-   uword when;
-   Point where;
-   int whichButton;
-   int modKey;
-   wsp ws;
-   } MouseInfoType;
-#endif                                  /* MacGraph */
-
-
-
 /*
  * Gamma Correction value to compensate for nonlinear monitor color response
  */

diff --git a/src/h/grttin.h b/src/h/grttin.h
@@ -394,15 +394,6 @@ typedef int va_list, siptr;
    #endif                               /* HAVE_LIBFREETYPE */
    #endif                               /* GraphicsGL */
 
-   #ifdef MacGraph
-      typedef int Str255, Point, StandardFileReply, SFTypeList, Ptr, PixMap;
-      typedef int Boolean, Rect, PolyHandle, EventRecord, wsp, MouseInfoType;
-      typedef int Handle, MenuHandle, OSErr, WindowPtr, GWorldFlags;
-      typedef int PaletteHandle, BitMap, RgnHandle, QDErr, GWorldPtr;
-      typedef int GrafPtr, GDHandle, PixMapHandle, OSType, FInfo;
-      typedef int IOParam, DialogPtr, ControlHandle, StringHandle, Size;
-   #endif                               /* MacGraph */
-
    #ifdef XWindows
       typedef int Atom, Time, XSelectionEvent, XErrorEvent, XErrorHandler;
       typedef int XGCValues, XColor, XFontStruct, XWindowAttributes, XEvent;

diff --git a/src/h/macgraph.h b/src/h/macgraph.h