hiro/openAV-Luppp
1
0
Fork 0
mirror of https://github.com/vale981/openAV-Luppp synced 2025-03-05 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make label code consistent

Browse source
This commit is contained in:
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/avtk/avtk_dial.h
View file

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

6
src/avtk/avtk_image.h
View file

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

2
src/avtk/avtk_light_button.h
View file

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