Mercurial > emacs
changeset 27514:9625ad0c0f52
(w32_term_init): Swap resx and height_in, resy and
width_in. Use w32_defined_color in place of defined_color.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Sun, 30 Jan 2000 18:32:14 +0000 |
| parents | 92055b86c800 |
| children | 3e276f92852a |
| files | src/w32term.c |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32term.c Sun Jan 30 17:52:18 2000 +0000 +++ b/src/w32term.c Sun Jan 30 18:32:14 2000 +0000 @@ -9608,8 +9608,8 @@ dpyinfo->root_window = GetDesktopWindow (); dpyinfo->n_planes = GetDeviceCaps (hdc, PLANES); dpyinfo->n_cbits = GetDeviceCaps (hdc, BITSPIXEL); - dpyinfo->height_in = GetDeviceCaps (hdc, LOGPIXELSX); - dpyinfo->width_in = GetDeviceCaps (hdc, LOGPIXELSY); + dpyinfo->resx = GetDeviceCaps (hdc, LOGPIXELSX); + dpyinfo->resy = GetDeviceCaps (hdc, LOGPIXELSY); dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; dpyinfo->grabbed = 0; dpyinfo->reference_count = 0; @@ -9632,8 +9632,8 @@ dpyinfo->w32_focus_event_frame = 0; dpyinfo->w32_highlight_frame = 0; dpyinfo->image_cache = make_image_cache (); - dpyinfo->resx = dpyinfo->height / dpyinfo->height_in; - dpyinfo->resy = dpyinfo->width / dpyinfo->width_in; + dpyinfo->height_in = dpyinfo->height / dpyinfo->resx; + dpyinfo->width_in = dpyinfo->width / dpyinfo->resy; ReleaseDC (GetDesktopWindow (), hdc); /* NTEMACS_TODO: dpyinfo->gray */ /* Determine if there is a middle mouse button, to allow parse_button @@ -9644,8 +9644,8 @@ /* initialise palette with white and black */ { COLORREF color; - defined_color (0, "white", &color, 1); - defined_color (0, "black", &color, 1); + w32_defined_color (0, "white", &color, 1); + w32_defined_color (0, "black", &color, 1); } #ifndef F_SETOWN_BUG