diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 01:09:49 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-09 01:09:49 +0000 |
| commit | a6b935289ed59305318929b857bf74f671125e87 (patch) | |
| tree | 20398a4cc1c49f2309b0b607e331aea2c433e17b /FL/Fl_Widget.H | |
| parent | 27a54dc22bb9b2fbb16b01a04cd8479d25470bec (diff) | |
Move the rest of the image file formats (except for XBM and XPM) to
the fltk_images library; saves about 16k in the FLTK core library on my
Intel system.
Fix a memory leak bug in most of the fl_set_fonts*.cxx implementations;
as a result, the Fl_Fontdesc structure now has a fontname member to old
the human-readable font name.
Lots of fixes for shadowed variables, etc.
Use snprintf, strlcpy, and strlcat in more places.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2566 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL/Fl_Widget.H')
| -rw-r--r-- | FL/Fl_Widget.H | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index a51bd7143..05515ebd7 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6.2.4.2.15 2002/07/23 15:07:32 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.16 2002/08/09 01:09:48 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -103,7 +103,7 @@ public: FL_EXPORT virtual void draw() = 0; FL_EXPORT virtual int handle(int); Fl_Group* parent() const {return parent_;} - void parent(Fl_Group* w) {parent_ = w;} // for hacks only, Fl_Group::add() + void parent(Fl_Group* p) {parent_ = p;} // for hacks only, Fl_Group::add() uchar type() const {return type_;} void type(uchar t) {type_ = t;} @@ -195,7 +195,7 @@ public: FL_EXPORT void damage(uchar c); FL_EXPORT void damage(uchar c,int,int,int,int); FL_EXPORT void draw_label(int, int, int, int, Fl_Align) const; - void measure_label(int& x, int& y) {label_.measure(x,y);} + void measure_label(int& xx, int& yy) {label_.measure(xx,yy);} FL_EXPORT Fl_Window* window() const ; @@ -212,5 +212,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.15 2002/07/23 15:07:32 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.16 2002/08/09 01:09:48 easysw Exp $". // |