diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2002-10-29 19:23:55 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2002-10-29 19:23:55 +0000 |
| commit | 314a351940e9537304ea3eacdf6663472d3dc85b (patch) | |
| tree | ae2860b773f737f1efe194cd7f3ab8a8e3fcdfac | |
| parent | 7e128e13da5fa97929d77e520bf9ca1e73b78345 (diff) | |
MacOS windows were rsizable even if size_range would not allow a resize.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2703 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | src/Fl_mac.cxx | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -1,5 +1,7 @@ CHANGES IN FLTK 1.1.2 + - MacOS windows were resizable, even when size_range would + not allow for resizing. - Fl_Text_Editor now supports Shift+Delete, Ctrl+Insert, and Shift+Insert for cut, copy, and paste, respectively. diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index ea4f3379d..59044019a 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_mac.cxx,v 1.1.2.34 2002/09/20 17:56:56 easysw Exp $" +// "$Id: Fl_mac.cxx,v 1.1.2.35 2002/10/29 19:23:55 matthiaswm Exp $" // // MacOS specific code for the Fast Light Tool Kit (FLTK). // @@ -1374,7 +1374,8 @@ void Fl_X::make(Fl_Window* w) int wp = w->w(); int hp = w->h(); if (w->size_range_set) { - winattr |= kWindowFullZoomAttribute | kWindowResizableAttribute | kWindowLiveResizeAttribute; + if ( w->minh != w->maxh || w->minw != w->maxw) + winattr |= kWindowFullZoomAttribute | kWindowResizableAttribute | kWindowLiveResizeAttribute; } else { if (w->resizable()) { Fl_Widget *o = w->resizable(); @@ -1723,6 +1724,6 @@ void Fl::paste(Fl_Widget &receiver, int clipboard) { // -// End of "$Id: Fl_mac.cxx,v 1.1.2.34 2002/09/20 17:56:56 easysw Exp $". +// End of "$Id: Fl_mac.cxx,v 1.1.2.35 2002/10/29 19:23:55 matthiaswm Exp $". // |