[Emacs-diffs] Changes to emacs/src/w32reg.c

[Jason Rumney]

Index: emacs/src/w32reg.c
diff -c emacs/src/w32reg.c:1.10 emacs/src/w32reg.c:1.11
*** emacs/src/w32reg.c:1.10     Mon Mar 31 15:35:24 2003
--- emacs/src/w32reg.c  Thu Jun  5 19:17:48 2003
***************
*** 30,35 ****
--- 30,62 ----
  
  #define REG_ROOT "SOFTWARE\\GNU\\Emacs"
  
+ /* Default system colors from the Display Control Panel settings.  */
+ #define SYSTEM_DEFAULT_RESOURCES                          \
+   "emacs.foreground:SystemWindowText\0"                         \
+   "emacs.background:SystemWindow\0"                       \
+   "emacs.tooltip.attributeForeground:SystemInfoText\0"    \
+   "emacs.tooltip.attributeBackground:SystemInfoWindow\0"  \
+   "emacs.tool-bar.attributeForeground:SystemButtonText\0" \
+   "emacs.tool-bar.attributeBackground:SystemButtonFace\0" \
+   "emacs.menu.attributeForeground:SystemMenuText\0"       \
+   "emacs.menu.attributeBackground:SystemMenu\0"           \
+   "emacs.scroll-bar.attributeForeground:SystemScrollbar"
+ 
+ /* Other possibilities for default faces:
+ 
+   region: Could use SystemHilight, but interferes with our ability to
+   see most syntax highlighting through the region face.
+ 
+   modeline: Could use System(In)ActiveTitle, gradient versions (not
+   supported on 95 and NT), but modeline is more like a status bar
+   really (which don't appear to be configurable in Windows).
+ 
+   highlight: Could use SystemHotTrackingColor, but it is not supported
+   on Windows 95 or NT, and other apps only seem to use it for menus
+   anyway.
+ 
+ */
+ 
  static char *
  w32_get_rdb_resource (rdb, resource)
       char *rdb;
***************
*** 109,115 ****
          hive = HKEY_LOCAL_MACHINE;
          goto trykey;
        }
!       return (NULL);
      }
    return (lpvalue);
  }
--- 136,144 ----
          hive = HKEY_LOCAL_MACHINE;
          goto trykey;
        }
! 
!       /* Check if there are Windows specific defaults defined.  */
!       return w32_get_rdb_resource (SYSTEM_DEFAULT_RESOURCES, name);
      }
    return (lpvalue);
  }