#include "console-msw.h"
#include "console-stream.h"
+#include "objects-msw.h"
#include "events.h"
#include "faces.h"
#include "frame.h"
static Lisp_Object
build_syscolor_string (int idx)
{
- DWORD clr;
- char buf[16];
-
- if (idx < 0)
- return Qnil;
-
- clr = GetSysColor (idx);
- sprintf (buf, "#%02X%02X%02X",
- GetRValue (clr),
- GetGValue (clr),
- GetBValue (clr));
- return build_string (buf);
+ return (idx < 0 ? Qnil : mswindows_color_to_string (GetSysColor (idx)));
}
static Lisp_Object
wc.lpszMenuName = NULL;
wc.lpszClassName = XEMACS_CLASS;
- wc.hIconSm = LoadImage (GetModuleHandle (NULL), XEMACS_CLASS,
+ wc.hIconSm = (HICON) LoadImage (GetModuleHandle (NULL), XEMACS_CLASS,
IMAGE_ICON, 16, 16, 0);
RegisterClassEx (&wc);
mswindows_delete_device (struct device *d)
{
#ifdef HAVE_DRAGNDROP
- DdeNameService (mswindows_dde_mlid, 0L, 0L, DNS_REGISTER);
+ DdeNameService (mswindows_dde_mlid, 0L, 0L, DNS_UNREGISTER);
+ DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_item_open);
+ DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_topic_system);
+ DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_service);
DdeUninitialize (mswindows_dde_mlid);
#endif
break;
/*** Colors ***/
-#define FROB(met, index1, index2) \
+#define FROB(met, fore, back) \
case DM_##met: \
- return build_syscolor_cons (index1, index2);
+ return build_syscolor_cons (fore, back);
- FROB (color_default, COLOR_WINDOW, COLOR_WINDOWTEXT);
- FROB (color_select, COLOR_HIGHLIGHT, COLOR_HIGHLIGHTTEXT);
- FROB (color_balloon, COLOR_INFOBK, COLOR_INFOTEXT);
- FROB (color_3d_face, COLOR_3DFACE, COLOR_BTNTEXT);
- FROB (color_3d_light, COLOR_3DLIGHT, COLOR_3DHILIGHT);
- FROB (color_3d_dark, COLOR_3DSHADOW, COLOR_3DDKSHADOW);
- FROB (color_menu, COLOR_MENU, COLOR_MENUTEXT);
- FROB (color_menu_highlight, COLOR_HIGHLIGHT, COLOR_HIGHLIGHTTEXT);
- FROB (color_menu_button, COLOR_MENU, COLOR_MENUTEXT);
- FROB (color_menu_disabled, COLOR_MENU, COLOR_GRAYTEXT);
- FROB (color_toolbar, COLOR_BTNFACE, COLOR_BTNTEXT);
- FROB (color_scrollbar, COLOR_SCROLLBAR, COLOR_CAPTIONTEXT);
+ FROB (color_default, COLOR_WINDOWTEXT, COLOR_WINDOW);
+ FROB (color_select, COLOR_HIGHLIGHTTEXT, COLOR_HIGHLIGHT);
+ FROB (color_balloon, COLOR_INFOTEXT, COLOR_INFOBK);
+ FROB (color_3d_face, COLOR_BTNTEXT, COLOR_BTNFACE);
+ FROB (color_3d_light, COLOR_3DHILIGHT, COLOR_3DLIGHT);
+ FROB (color_3d_dark, COLOR_3DDKSHADOW, COLOR_3DSHADOW);
+ FROB (color_menu, COLOR_MENUTEXT, COLOR_MENU);
+ FROB (color_menu_highlight, COLOR_HIGHLIGHTTEXT, COLOR_HIGHLIGHT);
+ FROB (color_menu_button, COLOR_MENUTEXT, COLOR_MENU);
+ FROB (color_menu_disabled, COLOR_GRAYTEXT, COLOR_MENU);
+ FROB (color_toolbar, COLOR_BTNTEXT, COLOR_BTNFACE);
+ FROB (color_scrollbar, COLOR_CAPTIONTEXT, COLOR_SCROLLBAR);
FROB (color_desktop, -1, COLOR_DESKTOP);
FROB (color_workspace, -1, COLOR_APPWORKSPACE);
#undef FROB
if (DEVICE_MSPRINTER_DEVMODE_SIZE(d) <= 0)
signal_open_printer_error (d);
- DEVICE_MSPRINTER_DEVMODE(d) = xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
+ DEVICE_MSPRINTER_DEVMODE(d) =
+ (DEVMODE*) xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
DocumentProperties (NULL, DEVICE_MSPRINTER_HPRINTER(d),
printer_name, DEVICE_MSPRINTER_DEVMODE(d),
NULL, DM_OUT_BUFFER);
if (DEVICE_MSPRINTER_DEVMODE_MIRROR(d) == NULL)
DEVICE_MSPRINTER_DEVMODE_MIRROR(d) =
- xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
+ (DEVMODE*) xmalloc (DEVICE_MSPRINTER_DEVMODE_SIZE(d));
memcpy (DEVICE_MSPRINTER_DEVMODE_MIRROR(d),
DEVICE_MSPRINTER_DEVMODE(d),