Author: matt
Date: 2011-05-22 06:23:24 -0700 (Sun, 22 May 2011)
New Revision: 8714
Log:
123: fixed links to labeltypes.
Modified:
branches/branch-3.0/src/Fl_File_Icon.cxx
branches/branch-3.0/src/Fl_Multi_Label.cxx
branches/branch-3.0/src/fl_engraved_label.cxx
branches/branch-3.0/src/fl_labeltype.cxx
Modified: branches/branch-3.0/src/Fl_File_Icon.cxx
===================================================================
--- branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-22 13:16:31 UTC (rev
8713)
+++ branches/branch-3.0/src/Fl_File_Icon.cxx 2011-05-22 13:23:24 UTC (rev
8714)
@@ -468,8 +468,7 @@
\param[in] x, y, w, h position and size of label
\param[in] a label alignment [not used]
*/
-void
-fltk3::FileIcon::labeltype(const fltk3::Label *o, // I - Label data
+void fl_icon_labeltype(const fltk3::Label *o, // I - Label data
int x, // I - X position of label
int y, // I - Y position of label
int w, // I - Width of label
Modified: branches/branch-3.0/src/Fl_Multi_Label.cxx
===================================================================
--- branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-22 13:16:31 UTC (rev
8713)
+++ branches/branch-3.0/src/Fl_Multi_Label.cxx 2011-05-22 13:23:24 UTC (rev
8714)
@@ -33,8 +33,7 @@
#include <fltk3/MenuItem.h>
#include <fltk3/MultiLabel.h>
-static void multi_labeltype(
- const fltk3::Label* o, int x, int y, int w, int h, fltk3::Align a)
+void fl_multi_labeltype(const fltk3::Label* o, int x, int y, int w, int h,
fltk3::Align a)
{
fltk3::MultiLabel* b = (fltk3::MultiLabel*)(o->value);
fltk3::Label local = *o;
@@ -66,12 +65,12 @@
}
void fltk3::MultiLabel::label(fltk3::Widget* o) {
- fltk3::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
+ fltk3::set_labeltype(fltk3::MULTI_LABEL, fl_multi_labeltype, multi_measure);
o->label(fltk3::MULTI_LABEL, (const char*)this);
}
void fltk3::MultiLabel::label(fltk3::MenuItem* o) {
- fltk3::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
+ fltk3::set_labeltype(fltk3::MULTI_LABEL, fl_multi_labeltype, multi_measure);
o->label(fltk3::MULTI_LABEL, (const char*)this);
}
Modified: branches/branch-3.0/src/fl_engraved_label.cxx
===================================================================
--- branches/branch-3.0/src/fl_engraved_label.cxx 2011-05-22 13:16:31 UTC
(rev 8713)
+++ branches/branch-3.0/src/fl_engraved_label.cxx 2011-05-22 13:23:24 UTC
(rev 8714)
@@ -48,15 +48,13 @@
if (align & fltk3::ALIGN_CLIP) fltk3::pop_clip();
}
-static void fl_shadow_label(
- const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
+void fl_shadow_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align)
{
static int data[2][3] = {{2,2,fltk3::DARK3},{0,0,0}};
innards(o, X, Y, W, H, align, data, 2);
}
-static void fl_engraved_label(
- const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
+void fl_engraved_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align)
{
static int data[7][3] = {
{1,0,fltk3::LIGHT3},{1,1,fltk3::LIGHT3},{0,1,fltk3::LIGHT3},
@@ -65,8 +63,7 @@
innards(o, X, Y, W, H, align, data, 7);
}
-static void fl_embossed_label(
- const fltk3::Label* o, int X, int Y, int W, int H, fltk3::Align align)
+void fl_embossed_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align)
{
static int data[7][3] = {
{-1,0,fltk3::LIGHT3},{-1,-1,fltk3::LIGHT3},{0,-1,fltk3::LIGHT3},
Modified: branches/branch-3.0/src/fl_labeltype.cxx
===================================================================
--- branches/branch-3.0/src/fl_labeltype.cxx 2011-05-22 13:16:31 UTC (rev
8713)
+++ branches/branch-3.0/src/fl_labeltype.cxx 2011-05-22 13:23:24 UTC (rev
8714)
@@ -58,14 +58,20 @@
#define MAX_LABELTYPE 16
+void fl_shadow_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align);
+void fl_engraved_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align);
+void fl_embossed_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align);
+void fl_multi_labeltype(const fltk3::Label* o, int x, int y, int w, int h,
fltk3::Align a);
+void fl_icon_labeltype(const fltk3::Label* o, int x, int y, int w, int h,
fltk3::Align a);
+
static fltk3::LabelDrawF* table[MAX_LABELTYPE] = {
fl_normal_label,
fl_no_label,
- fl_normal_label, // _FL_SHADOW_LABEL,
- fl_normal_label, // _FL_ENGRAVED_LABEL,
- fl_normal_label, // _FL_EMBOSSED_LABEL,
- fl_no_label, // _FL_MULTI_LABEL,
- fl_no_label, // _FL_ICON_LABEL,
+ fl_shadow_label, // FL_SHADOW_LABEL,
+ fl_engraved_label, // FL_ENGRAVED_LABEL,
+ fl_embossed_label, // _FL_EMBOSSED_LABEL,
+ fl_multi_labeltype, // _FL_MULTI_LABEL,
+ fl_icon_labeltype, // _FL_ICON_LABEL,
// fltk3::FREE_LABELTYPE+n:
fl_no_label, fl_no_label, fl_no_label,
fl_no_label, fl_no_label, fl_no_label,
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
