X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=window.c;h=4bcc2697e09c75f90ab7299aadbaa56049ddb936;hb=7fbbad0ce1216e66fccab818c0349e2413a3898c;hp=6f5b67002e55cce2f2751266c5f2e7eee67d12e7;hpb=c7aec27d6f41dc75a47e90ff7d290756394730f3;p=PuTTY.git

diff --git a/window.c b/window.c
index 6f5b6700..4bcc2697 100644
--- a/window.c
+++ b/window.c
@@ -2434,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) {
@@ -4222,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);
 }