summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjenglish <jenglish@flightlab.com>2004-08-10 18:14:17 (GMT)
committerjenglish <jenglish@flightlab.com>2004-08-10 18:14:17 (GMT)
commit5d56b4f852eef0293a312eaff20e8701ac54a86a (patch)
tree94bc9f5b462fa559cd64860595b1eb0de0b3af0a
parentd5fe0750220b427c1aa8081d80bf33c614c5f987 (diff)
downloadtk-5d56b4f852eef0293a312eaff20e8701ac54a86a.zip
tk-5d56b4f852eef0293a312eaff20e8701ac54a86a.tar.gz
tk-5d56b4f852eef0293a312eaff20e8701ac54a86a.tar.bz2
Fix for #1006686 "wm resizable command not working on Solaris/CDE"
(patch from Colin McDonald).
-rw-r--r--ChangeLog5
-rw-r--r--unix/tkUnixWm.c4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e64321f..1115f8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-10 Joe English <jenglish@users.sourceforge.net>
+
+ * unix/tkUnixWm.c: Fix for #1006686 "wm resizable command
+ not working on Solaris/CDE" (patch from Colin McDonald).
+
2004-08-09 Mo DeJong <mdejong@users.sourceforge.net>
* tests/canvText.test:
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index e36bc32..f9f4cc5 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.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: tkUnixWm.c,v 1.36.2.1 2004/04/21 02:45:22 jenglish Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.36.2.2 2004/08/10 18:14:18 jenglish Exp $
*/
#include "tkPort.h"
@@ -4239,6 +4239,7 @@ UpdateSizeHints(winPtr)
hintsPtr->min_width = winPtr->reqWidth;
}
hintsPtr->max_width = hintsPtr->min_width;
+ hintsPtr->flags |= PMaxSize;
}
if (wmPtr->flags & WM_HEIGHT_NOT_RESIZABLE) {
if (wmPtr->height >= 0) {
@@ -4247,6 +4248,7 @@ UpdateSizeHints(winPtr)
hintsPtr->min_height = winPtr->reqHeight + wmPtr->menuHeight;
}
hintsPtr->max_height = hintsPtr->min_height;
+ hintsPtr->flags |= PMaxSize;
}
XSetWMNormalHints(winPtr->display, wmPtr->wrapperPtr->window, hintsPtr);