The button width/height arrays were not properly initialized before

calling fl_measure()...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2283 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2002-06-06 14:22:05 +00:00
parent a4cd699340
commit 16de7b6048
2 changed files with 8 additions and 8 deletions

View File

@ -3,7 +3,8 @@ CHANGES IN FLTK 1.1.0rc3
- Documentation updates.
- Did some testing with Valgrind and fixed some memory
problems in Fl_Help_View::Fl_HelpView,
Fl_Menu_::remove(), and Fl_Text_Display::draw_vline().
Fl_Menu_::remove(), Fl_Text_Display::draw_vline(), and
resizeform() (convenience dialogs).
- Fixed some redraw() bugs, and now redraw portions of
the parent widget when the label appears outside the
widget.

View File

@ -1,5 +1,5 @@
//
// "$Id: fl_ask.cxx,v 1.8.2.8.2.8 2002/04/09 09:38:15 easysw Exp $"
// "$Id: fl_ask.cxx,v 1.8.2.8.2.9 2002/06/06 14:22:05 easysw Exp $"
//
// Standard dialog functions for the Fast Light Tool Kit (FLTK).
//
@ -108,6 +108,10 @@ void resizeform() {
message_h = 30;
fl_font(button[0]->labelfont(), button[0]->labelsize());
memset(button_w, 0, sizeof(button_w));
memset(button_h, 0, sizeof(button_h));
for (max_h = 25, i = 0; i < 3; i ++)
if (button[i]->visible())
{
@ -122,11 +126,6 @@ void resizeform() {
if (button_h[i] > max_h)
max_h = button_h[i];
}
else
{
button_w[i] = 0;
button_h[i] = 0;
}
if (input->visible()) icon_size = message_h + 25;
else icon_size = message_h;
@ -343,5 +342,5 @@ const char *fl_password(const char *fmt, const char *defstr, ...) {
}
//
// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.8 2002/04/09 09:38:15 easysw Exp $".
// End of "$Id: fl_ask.cxx,v 1.8.2.8.2.9 2002/06/06 14:22:05 easysw Exp $".
//