mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-25 09:12:24 +00:00
Add Jacob's patch for compiling without multimon.h.
[originally from svn r1315]
This commit is contained in:
parent
cb102602a9
commit
aa5f38e53c
6
Makefile
6
Makefile
@ -40,6 +40,12 @@
|
|||||||
# build, since at the time of writing this <aclapi.h> is known
|
# build, since at the time of writing this <aclapi.h> is known
|
||||||
# not to be available in Cygwin.
|
# not to be available in Cygwin.
|
||||||
#
|
#
|
||||||
|
# - COMPAT=/DNO_MULTIMON
|
||||||
|
# Disables PuTTY's use of <multimon.h>, which is not available
|
||||||
|
# with some development environments. This means that PuTTY's
|
||||||
|
# full-screen mode (configurable to work on Alt-Enter) will
|
||||||
|
# not behave usefully in a multi-monitor environment.
|
||||||
|
#
|
||||||
# - RCFL=/DASCIICTLS
|
# - RCFL=/DASCIICTLS
|
||||||
# Uses ASCII rather than Unicode to specify the tab control in
|
# Uses ASCII rather than Unicode to specify the tab control in
|
||||||
# the resource file. Probably most useful when compiling with
|
# the resource file. Probably most useful when compiling with
|
||||||
|
5
window.c
5
window.c
@ -10,7 +10,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if WINVER < 0x0500
|
#if (WINVER < 0x0500) && !defined(NO_MULTIMON)
|
||||||
#define COMPILE_MULTIMON_STUBS
|
#define COMPILE_MULTIMON_STUBS
|
||||||
#include <multimon.h>
|
#include <multimon.h>
|
||||||
#endif
|
#endif
|
||||||
@ -3843,7 +3843,7 @@ static void flip_full_screen(void)
|
|||||||
|
|
||||||
if (full_screen) {
|
if (full_screen) {
|
||||||
int x, y, cx, cy;
|
int x, y, cx, cy;
|
||||||
#ifdef MONITOR_DEFAULTTONEAREST
|
#if !defined(NO_MULTIMON) && defined(MONITOR_DEFAULTTONEAREST)
|
||||||
/* The multi-monitor safe way of doing things */
|
/* The multi-monitor safe way of doing things */
|
||||||
HMONITOR mon;
|
HMONITOR mon;
|
||||||
MONITORINFO mi;
|
MONITORINFO mi;
|
||||||
@ -3887,4 +3887,3 @@ static void flip_full_screen(void)
|
|||||||
CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
|
CheckMenuItem(GetSystemMenu(hwnd, FALSE), IDM_FULLSCREEN,
|
||||||
MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED);
|
MF_BYCOMMAND| full_screen ? MF_CHECKED : MF_UNCHECKED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user