From 0c210ae8674b94163f6840bda75e25eedbc0d4d1 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Fri, 7 Jul 2017 19:16:40 +0000 Subject: Introduce Fl_Group::bounds(), deprecate Fl_Group::sizes(). The new method Fl_Group::bounds() replaces Fl_Group::sizes() whose internal array structure was not documented. Fl_Group::bounds() uses the new and documented class Fl_Rect for its internal structure. src/Fl_Tile.cxx now uses bounds() instead of sizes(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12302 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/Fl_Group.H | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'FL') diff --git a/FL/Fl_Group.H b/FL/Fl_Group.H index 8a6f8f6e1..8ab96c9a6 100644 --- a/FL/Fl_Group.H +++ b/FL/Fl_Group.H @@ -3,7 +3,7 @@ // // Group header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2017 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -22,9 +22,8 @@ #ifndef Fl_Group_H #define Fl_Group_H -#ifndef Fl_Widget_H #include "Fl_Widget.H" -#endif +#include "Fl_Rect.H" /** The Fl_Group class is the FLTK container widget. It maintains @@ -44,7 +43,8 @@ class FL_EXPORT Fl_Group : public Fl_Widget { Fl_Widget* savedfocus_; Fl_Widget* resizable_; int children_; - int *sizes_; // remembered initial sizes of children + Fl_Rect *bounds_; // remembered initial sizes of children + int *sizes_; // remembered initial sizes of children (FLTK 1.3 compat.) int navigation(int); static Fl_Group *current_; @@ -59,7 +59,8 @@ protected: void draw_children(); void draw_outside_label(const Fl_Widget& widget) const ; void update_child(Fl_Widget& widget) const; - int *sizes(); + Fl_Rect *bounds(); + int *sizes(); // FLTK 1.3 compatibility public: -- cgit v1.2.3