diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-22 15:35:02 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-11-22 15:35:02 +0000 |
| commit | f5258404959cff3a299c796676b553b843a94355 (patch) | |
| tree | f6820c57e99b0038b9bc734d7123d536a33af267 /fluid | |
| parent | 4323f46e2c31bc070036a9923711293f169ffb85 (diff) | |
Fix all references to '.C' files (now .cxx)
Update Fl_Image() class to track depth and data, so FLUID will be
able to use it as the base class.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1712 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Fluid_Image.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fluid/Fluid_Image.cxx b/fluid/Fluid_Image.cxx index 4c43c1aa3..34aeccfda 100644 --- a/fluid/Fluid_Image.cxx +++ b/fluid/Fluid_Image.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.3 2001/09/30 17:37:06 easysw Exp $" +// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.4 2001/11/22 15:35:01 easysw Exp $" // // Pixmap label support for the Fast Light Tool Kit (FLTK). // @@ -81,7 +81,7 @@ void pixmap_image::write_static() { int l; for (l = 0; l < numlines; l++) { if (l) write_c(",\n"); - write_cstring(p->data[l],linelength[l]); + write_cstring(p->data()[l],linelength[l]); } write_c("\n};\n"); write_c("static Fl_Pixmap %s(%s);\n", @@ -188,8 +188,8 @@ pixmap_image::pixmap_image(const char *name, FILE *f) : Fluid_Image(name) { } pixmap_image::~pixmap_image() { - if (p && p->data) { - char** real_data = (char**)(p->data); + if (p && p->data()) { + char** real_data = (char**)(p->data()); for (int i = 0; i < numlines; i++) delete[] real_data[i]; free((void*)real_data); } @@ -227,11 +227,11 @@ gif_image::gif_image(const char *name, FILE *f) : pixmap_image(name,0) { } gif_image::~gif_image() { - if (p && p->data) { - char** real_data = (char**)(p->data); + if (p && p->data()) { + char** real_data = (char**)(p->data()); for (int i = 0; i < 3; i++) delete[] real_data[i]; delete[] real_data; - p->data = 0; +// p->data(0,0); } } @@ -450,5 +450,5 @@ Fluid_Image *ui_find_image(const char *oldname) { } // -// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.3 2001/09/30 17:37:06 easysw Exp $". +// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.4 2001/11/22 15:35:01 easysw Exp $". // |