X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=window.c;h=4bcc2697e09c75f90ab7299aadbaa56049ddb936;hb=fdbd6978016e9fd87db7b3bfc33ff0da8bd3eea9;hp=59901010e07eb2210b6523b4ae3fad8e988be83a;hpb=02a926f6c125c580f77d1520f2d050ee2d3a9a25;p=PuTTY.git

diff --git a/window.c b/window.c
index 59901010..4bcc2697 100644
--- a/window.c
+++ b/window.c
@@ -11,10 +11,12 @@
 #endif
 #endif
 
+#ifndef NO_MULTIMON
 #if WINVER < 0x0500
 #define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #endif
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -2432,7 +2434,7 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT message,
 	    return TRUE;
 	}
       default:
-	if (message == wm_mousewheel) {
+	if (message == wm_mousewheel || message == WM_MOUSEWHEEL) {
 	    int shift_pressed=0, control_pressed=0, alt_pressed=0;
 
 	    if (message == WM_MOUSEWHEEL) {
@@ -4220,6 +4222,11 @@ void set_iconic(int iconic)
  */
 void move_window(int x, int y)
 {
+    if (cfg.resize_action == RESIZE_DISABLED || 
+        cfg.resize_action == RESIZE_FONT ||
+	IsZoomed(hwnd))
+       return;
+
     SetWindowPos(hwnd, NULL, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
 }