Author: matt
Date: 2011-01-10 12:04:58 -0800 (Mon, 10 Jan 2011)
New Revision: 8245
Log:
Correct Labeltype
Modified:
branches/branch-3.0-2011/src/Fl_Multi_Label.cxx
branches/branch-3.0-2011/src/fl_engraved_label.cxx
branches/branch-3.0-2011/src/fl_labeltype.cxx
Modified: branches/branch-3.0-2011/src/Fl_Multi_Label.cxx
===================================================================
--- branches/branch-3.0-2011/src/Fl_Multi_Label.cxx 2011-01-10 19:41:50 UTC
(rev 8244)
+++ branches/branch-3.0-2011/src/Fl_Multi_Label.cxx 2011-01-10 20:04:58 UTC
(rev 8245)
@@ -33,7 +33,7 @@
#include <fltk3/Fl_Menu_Item.H>
#include <fltk3/Fl_Multi_Label.H>
-static void multi_labeltype(
+void fl_multi_label(
const fltk3::Label* o, int x, int y, int w, int h, fltk3::Align a)
{
Fl_Multi_Label* b = (Fl_Multi_Label*)(o->value);
@@ -53,7 +53,7 @@
}
// measurement is only correct for left-to-right appending...
-static void multi_measure(const fltk3::Label* o, int& w, int& h) {
+void fl_multi_label_measure(const fltk3::Label* o, int& w, int& h) {
Fl_Multi_Label* b = (Fl_Multi_Label*)(o->value);
fltk3::Label local = *o;
local.value = b->labela;
@@ -65,16 +65,6 @@
w += W; if (H>h) h = H;
}
-void Fl_Multi_Label::label(fltk3::Widget* o) {
- fltk3::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
- o->label(fltk3::MULTI_LABEL, (const char*)this);
-}
-
-void Fl_Multi_Label::label(Fl_Menu_Item* o) {
- fltk3::set_labeltype(fltk3::MULTI_LABEL, multi_labeltype, multi_measure);
- o->label(fltk3::MULTI_LABEL, (const char*)this);
-}
-
//
// End of "$Id$".
//
Modified: branches/branch-3.0-2011/src/fl_engraved_label.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_engraved_label.cxx 2011-01-10 19:41:50 UTC
(rev 8244)
+++ branches/branch-3.0-2011/src/fl_engraved_label.cxx 2011-01-10 20:04:58 UTC
(rev 8245)
@@ -48,15 +48,13 @@
if (align & fltk3::ALIGN_CLIP) fl_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,FL_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,FL_LIGHT3},{1,1,FL_LIGHT3},{0,1,FL_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,FL_LIGHT3},{-1,-1,FL_LIGHT3},{0,-1,FL_LIGHT3},
@@ -75,19 +72,6 @@
innards(o, X, Y, W, H, align, data, 7);
}
-fltk3::Labeltype fl_define_FL_SHADOW_LABEL() {
- fltk3::set_labeltype(fltk3::SHADOW_LABEL, fl_shadow_label, 0);
- return fltk3::SHADOW_LABEL;
-}
-fltk3::Labeltype fl_define_FL_ENGRAVED_LABEL() {
- fltk3::set_labeltype(fltk3::ENGRAVED_LABEL, fl_engraved_label, 0);
- return fltk3::ENGRAVED_LABEL;
-}
-fltk3::Labeltype fl_define_FL_EMBOSSED_LABEL() {
- fltk3::set_labeltype(fltk3::EMBOSSED_LABEL, fl_embossed_label, 0);
- return fltk3::EMBOSSED_LABEL;
-}
-
//
// End of "$Id$".
//
Modified: branches/branch-3.0-2011/src/fl_labeltype.cxx
===================================================================
--- branches/branch-3.0-2011/src/fl_labeltype.cxx 2011-01-10 19:41:50 UTC
(rev 8244)
+++ branches/branch-3.0-2011/src/fl_labeltype.cxx 2011-01-10 20:04:58 UTC
(rev 8245)
@@ -58,22 +58,28 @@
#define MAX_LABELTYPE 16
+extern void fl_shadow_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align);
+extern void fl_engraved_label(const fltk3::Label* o, int X, int Y, int W, int
H, fltk3::Align align);
+extern void fl_embossed_label(const fltk3::Label* o, int X, int Y, int W, int
H, fltk3::Align align);
+extern void fl_multi_label(const fltk3::Label* o, int X, int Y, int W, int H,
fltk3::Align align);
+
// TODO: FLTK123 - fill the label type table!
static Fl_Label_Draw_F* 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_normal_label, // _FL_MULTI_LABEL,
+ fl_normal_label, // _FL_ICON_LABEL,
+ fl_normal_label, // _FL_IMAGE_LABEL,
// FL_FREE_LABELTYPE+n:
+ fl_no_label, fl_no_label,
fl_no_label, fl_no_label, fl_no_label,
- fl_no_label, fl_no_label, fl_no_label,
fl_no_label, fl_no_label, fl_no_label
};
-static Fl_Label_Measure_F* measure[MAX_LABELTYPE];
+static Fl_Label_Measure_F* measure[MAX_LABELTYPE] = {};
/** Sets the functions to call to draw and measure a specific labeltype. */
void fltk3::set_labeltype(fltk3::Labeltype t,Fl_Label_Draw_F*
f,Fl_Label_Measure_F*m)
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
