Make label code consistent

main
Mathias Buhr 2017-04-23 17:13:45 +02:00 committed by Harry van Haaren
parent c5d33f89cd
commit c322bc83b4
3 changed files with 7 additions and 7 deletions

View File

@ -30,9 +30,10 @@ namespace Avtk
class Dial : public Fl_Slider
{
public:
Dial(int _x, int _y, int _w, int _h, const char* _lab=0):
Fl_Slider(_x, _y, _w, _h, _lab)
Dial(int _x, int _y, int _w, int _h, const char* _label=0):
Fl_Slider(_x, _y, _w, _h)
{
copy_label(_label);
x = _x;
y = _y;
w = _w;
@ -49,7 +50,6 @@ public:
bool highlight;
bool pan_style;
int x, y, w, h;
char* _label;
float radius;
float lineWidth;

View File

@ -40,15 +40,14 @@ class Image : public Fl_Widget
{
public:
Image(int _x, int _y, int _w, int _h, const char *_label=0 ):
Fl_Widget(_x, _y, _w, _h, _label)
Fl_Widget(_x, _y, _w, _h)
{
copy_label(_label);
x = _x;
y = _y;
w = _w;
h = _h;
label = _label;
bits = -1;
imageDataPtr = 0;
@ -65,7 +64,6 @@ public:
}
int x, y, w, h;
const char* label;
int bits;
const unsigned char* imageDataPtr;

View File

@ -31,6 +31,8 @@ public:
LightButton(int _x, int _y, int _w, int _h, const char *_label):
Fl_Button(_x, _y, _w, _h)
{
copy_label(_label);
x = _x;
y = _y;
w = _w;