[Emacs-diffs] Changes to emacs/src/macgui.h

[Steven Tamm]

Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.11 emacs/src/macgui.h:1.12
*** emacs/src/macgui.h:1.11     Sun Oct 10 16:56:20 2004
--- emacs/src/macgui.h  Mon Dec 27 17:27:30 2004
***************
*** 62,79 ****
  #else
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
! #include <Controls.h>         /* for ControlHandle in xdisp.c */
  #include <Gestalt.h>
  #endif
  
  typedef GWorldPtr Pixmap;
  
  #if TARGET_API_MAC_CARBON
- typedef struct OpaqueWindowPtr *Window;
  #define Cursor ThemeCursor
  #define No_Cursor (-1)
  #else
- typedef WindowPtr Window;
  #define SetPortWindowPort(w) SetPort(w)
  #define Cursor CursHandle
  #define No_Cursor (0)
--- 62,78 ----
  #else
  #include <QuickDraw.h>                /* for WindowPtr */
  #include <QDOffscreen.h>      /* for GWorldPtr */
! #include <Windows.h>
  #include <Gestalt.h>
  #endif
  
+ typedef WindowPtr Window;
  typedef GWorldPtr Pixmap;
  
  #if TARGET_API_MAC_CARBON
  #define Cursor ThemeCursor
  #define No_Cursor (-1)
  #else
  #define SetPortWindowPort(w) SetPort(w)
  #define Cursor CursHandle
  #define No_Cursor (0)
***************
*** 198,203 ****
--- 197,225 ----
  #define XNegative     0x0010
  #define YNegative     0x0020
  
+ typedef struct {
+       long flags;     /* marks which fields in this structure are defined */
+ #if 0
+       int x, y;               /* obsolete for new window mgrs, but clients */
+       int width, height;      /* should set so old wm's don't mess up */
+ #endif
+       int min_width, min_height;
+ #if 0
+       int max_width, max_height;
+ #endif
+       int width_inc, height_inc;
+ #if 0
+       struct {
+               int x;  /* numerator */
+               int y;  /* denominator */
+       } min_aspect, max_aspect;
+ #endif
+       int base_width, base_height;            /* added by ICCCM version 1 */
+ #if 0
+       int win_gravity;                        /* added by ICCCM version 1 */
+ #endif
+ } XSizeHints;
+ 
  #define USPosition    (1L << 0) /* user specified x, y */
  #define USSize                (1L << 1) /* user specified width, height */