* win/tkWinWm.c: Changed so windows that aren't resizable don't

have resize handles and the zoom box is disabled.

1 files changed, 20 insertions, 1 deletions

diff --git a/win/tkWinWm.c b/win/tkWinWm.c
index faac1f8..98414e2 100644
--- a/win/tkWinWm.c
+++ b/win/tkWinWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkWinWm.c,v 1.5 1998/10/14 00:34:39 rjohnson Exp $
+ * RCS: @(#) $Id: tkWinWm.c,v 1.6 1999/02/04 21:01:46 stanton Exp $
  */
 
 #include "tkWinInt.h"
@@ -683,6 +683,11 @@ UpdateWrapper(winPtr)
 	    wmPtr->exStyle = EX_TOPLEVEL_STYLE;
 	}
 
+	if ((wmPtr->flags & WM_WIDTH_NOT_RESIZABLE)
+		&& (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE)) {
+	    wmPtr->style &= ~ (WS_MAXIMIZEBOX | WS_SIZEBOX);
+	}
+
 	/*
 	 * Compute the geometry of the parent and child windows.
 	 */
@@ -2381,6 +2386,11 @@ UpdateGeometryInfo(clientData)
 	return;
     }
 
+    if (wmPtr->flags & WM_UPDATE_SIZE_HINTS) {
+	wmPtr->flags &= ~WM_UPDATE_SIZE_HINTS;
+	UpdateWrapper(winPtr);
+    }
+	   
     /*
      * Compute the border size for the current window style.  This
      * size will include the resize handles, the title bar and the
@@ -3954,6 +3964,15 @@ WmProc(hwnd, message, wParam, lParam)
 
 	case WM_ENTERSIZEMOVE:
 	    inMoveSize = 1;
+
+	    /*
+	     * Cancel any current mouse timer.  If the mouse timer
+	     * fires during the size/move mouse capture, it will
+	     * release the capture, which is wrong.
+	     */
+
+	    TkWinCancelMouseTimer();
+
 	    oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
 	    break;