diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-26 11:32:37 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-04-26 11:32:37 +0000 |
| commit | ee5fdc99cec4d9bf9a91e42fbda9acc757fffebd (patch) | |
| tree | 20a7e0d7af0a104ebb7bc0a515eadba40806bb7e /FL | |
| parent | b3f01efb17521096f94be046659d4737f2b3203d (diff) | |
Images in menu items...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2109 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Enumerations.H | 5 | ||||
| -rw-r--r-- | FL/Fl_Image.H | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/FL/Enumerations.H b/FL/Enumerations.H index fe76d36d9..cbf81f1f9 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.14.2.22 2002/04/11 10:46:19 easysw Exp $" +// "$Id: Enumerations.H,v 1.18.2.14.2.23 2002/04/26 11:32:37 easysw Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -213,6 +213,7 @@ enum Fl_Labeltype { // labeltypes: _FL_EMBOSSED_LABEL, _FL_MULTI_LABEL, _FL_ICON_LABEL, + _FL_IMAGE_LABEL, FL_FREE_LABELTYPE }; @@ -388,5 +389,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.14.2.22 2002/04/11 10:46:19 easysw Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.14.2.23 2002/04/26 11:32:37 easysw Exp $". // diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H index 95a465278..2ab513f8c 100644 --- a/FL/Fl_Image.H +++ b/FL/Fl_Image.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Image.H,v 1.5.2.3.2.11 2002/01/07 20:40:02 easysw Exp $" +// "$Id: Fl_Image.H,v 1.5.2.3.2.12 2002/04/26 11:32:37 easysw Exp $" // // Image header file for the Fast Light Tool Kit (FLTK). // @@ -48,6 +48,9 @@ class FL_EXPORT Fl_Image { void data(const char * const *p, int c) {data_ = p; count_ = c;} void draw_empty(int X, int Y); + static void labeltype(const Fl_Label *lo, int lx, int ly, int lw, int lh, Fl_Align la); + static void measure(const Fl_Label *lo, int &lw, int &lh); + public: int w() const {return w_;} @@ -95,5 +98,5 @@ class FL_EXPORT Fl_RGB_Image : public Fl_Image { #endif // -// End of "$Id: Fl_Image.H,v 1.5.2.3.2.11 2002/01/07 20:40:02 easysw Exp $". +// End of "$Id: Fl_Image.H,v 1.5.2.3.2.12 2002/04/26 11:32:37 easysw Exp $". // |