Author: matt
Date: 2012-05-12 15:34:42 -0700 (Sat, 12 May 2012)
New Revision: 9486
Log:
Updated fltk1 emulation wrapper to create widgets in the new relative
coordinate system. This solves a bunch of problems, but by far not all of them.
Fluid1 somewhat works, but the overlay is wrong in groups. And much more... .
Modified:
branches/branch-3.0/include/FL/Fl_Adjuster.H
branches/branch-3.0/include/FL/Fl_Box.H
branches/branch-3.0/include/FL/Fl_Browser.H
branches/branch-3.0/include/FL/Fl_Browser_.H
branches/branch-3.0/include/FL/Fl_Button.H
branches/branch-3.0/include/FL/Fl_Chart.H
branches/branch-3.0/include/FL/Fl_Check_Browser.H
branches/branch-3.0/include/FL/Fl_Check_Button.H
branches/branch-3.0/include/FL/Fl_Choice.H
branches/branch-3.0/include/FL/Fl_Clock.H
branches/branch-3.0/include/FL/Fl_Color_Chooser.H
branches/branch-3.0/include/FL/Fl_Counter.H
branches/branch-3.0/include/FL/Fl_Dial.H
branches/branch-3.0/include/FL/Fl_Double_Window.H
branches/branch-3.0/include/FL/Fl_File_Browser.H
branches/branch-3.0/include/FL/Fl_File_Input.H
branches/branch-3.0/include/FL/Fl_Fill_Dial.H
branches/branch-3.0/include/FL/Fl_Fill_Slider.H
branches/branch-3.0/include/FL/Fl_Float_Input.H
branches/branch-3.0/include/FL/Fl_Gl_Window.H
branches/branch-3.0/include/FL/Fl_Group.H
branches/branch-3.0/include/FL/Fl_Help_View.H
branches/branch-3.0/include/FL/Fl_Hold_Browser.H
branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Slider.H
branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H
branches/branch-3.0/include/FL/Fl_Input.H
branches/branch-3.0/include/FL/Fl_Input_.H
branches/branch-3.0/include/FL/Fl_Input_Choice.H
branches/branch-3.0/include/FL/Fl_Int_Input.H
branches/branch-3.0/include/FL/Fl_Light_Button.H
branches/branch-3.0/include/FL/Fl_Line_Dial.H
branches/branch-3.0/include/FL/Fl_Menu_.H
branches/branch-3.0/include/FL/Fl_Menu_Bar.H
branches/branch-3.0/include/FL/Fl_Menu_Button.H
branches/branch-3.0/include/FL/Fl_Menu_Window.H
branches/branch-3.0/include/FL/Fl_Multi_Browser.H
branches/branch-3.0/include/FL/Fl_Multiline_Input.H
branches/branch-3.0/include/FL/Fl_Multiline_Output.H
branches/branch-3.0/include/FL/Fl_Nice_Slider.H
branches/branch-3.0/include/FL/Fl_Output.H
branches/branch-3.0/include/FL/Fl_Overlay_Window.H
branches/branch-3.0/include/FL/Fl_Pack.H
branches/branch-3.0/include/FL/Fl_Positioner.H
branches/branch-3.0/include/FL/Fl_Progress.H
branches/branch-3.0/include/FL/Fl_Radio_Button.H
branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H
branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H
branches/branch-3.0/include/FL/Fl_Repeat_Button.H
branches/branch-3.0/include/FL/Fl_Return_Button.H
branches/branch-3.0/include/FL/Fl_Roller.H
branches/branch-3.0/include/FL/Fl_Round_Button.H
branches/branch-3.0/include/FL/Fl_Round_Clock.H
branches/branch-3.0/include/FL/Fl_Scroll.H
branches/branch-3.0/include/FL/Fl_Scrollbar.H
branches/branch-3.0/include/FL/Fl_Secret_Input.H
branches/branch-3.0/include/FL/Fl_Select_Browser.H
branches/branch-3.0/include/FL/Fl_Simple_Counter.H
branches/branch-3.0/include/FL/Fl_Single_Window.H
branches/branch-3.0/include/FL/Fl_Slider.H
branches/branch-3.0/include/FL/Fl_Spinner.H
branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H
branches/branch-3.0/include/FL/Fl_Table.H
branches/branch-3.0/include/FL/Fl_Table_Row.H
branches/branch-3.0/include/FL/Fl_Tabs.H
branches/branch-3.0/include/FL/Fl_Text_Display.H
branches/branch-3.0/include/FL/Fl_Text_Editor.H
branches/branch-3.0/include/FL/Fl_Tile.H
branches/branch-3.0/include/FL/Fl_Timer.H
branches/branch-3.0/include/FL/Fl_Toggle_Button.H
branches/branch-3.0/include/FL/Fl_Tree.H
branches/branch-3.0/include/FL/Fl_Valuator.H
branches/branch-3.0/include/FL/Fl_Value_Input.H
branches/branch-3.0/include/FL/Fl_Value_Output.H
branches/branch-3.0/include/FL/Fl_Value_Slider.H
branches/branch-3.0/include/FL/Fl_Widget.H
branches/branch-3.0/include/FL/Fl_Window.H
branches/branch-3.0/include/FL/Fl_Wizard.H
Modified: branches/branch-3.0/include/FL/Fl_Adjuster.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Adjuster.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Adjuster.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -53,7 +53,7 @@
Fl_Adjuster() { /* empty */ }
Fl_Adjuster(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::Adjuster_I(x, y, w, h, label);
+ _p = new fltk3::Adjuster_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Box.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Box.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Box.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -45,12 +45,12 @@
FLTK3_WIDGET_VCALLS(Fl_Box, Box)
Fl_Box(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::Box_I(x, y, w, h, label);
+ _p = new fltk3::Box_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Fl_Box(Fl_Boxtype b, int x, int y, int w, int h, const char *label) {
- _p = new fltk3::Box_I(x, y, w, h, label);
+ _p = new fltk3::Box_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
box(b);
}
Modified: branches/branch-3.0/include/FL/Fl_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Browser.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Browser.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -178,7 +178,7 @@
Fl_Browser() { /* empty */ }
Fl_Browser(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Browser_I(X, Y, W, H, L);
+ _p = new fltk3::Browser_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Browser_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Browser_.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Browser_.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -127,7 +127,7 @@
Fl_Browser_() { /* empty */ }
Fl_Browser_(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::Browser__I(x, y, w, h, label);
+ _p = new fltk3::Browser__I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Button.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Button.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -62,7 +62,7 @@
Fl_Button() {}
Fl_Button(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Button_I(x, y, w, h, label);
+ _p = new fltk3::Button_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Chart.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Chart.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Chart.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -67,7 +67,7 @@
Fl_chart() { /* empty */ }
Fl_Chart(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Chart_I(X, Y, W, H, L);
+ _p = new fltk3::Chart_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Check_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Check_Browser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Check_Browser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Check_Browser() { /* empty */ }
Fl_Check_Browser(int x, int y, int w, int h, const char *l = 0) {
- _p = new fltk3::CheckBrowser_I(x, y, w, h, l);
+ _p = new fltk3::CheckBrowser_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Check_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Check_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Check_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Check_Button() { /* empty */ }
Fl_Check_Button(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::CheckButton_I(X, Y, W, H, L);
+ _p = new fltk3::CheckButton_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Choice.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Choice.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Choice.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -46,7 +46,7 @@
FLTK3_WIDGET_VCALLS(Fl_Choice, Choice)
Fl_Choice(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Choice_I(X, Y, W, H, L);
+ _p = new fltk3::Choice_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Clock.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Clock.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Clock.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -63,7 +63,7 @@
Fl_Clock_Output() { /* empty */ }
Fl_Clock_Output(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::ClockOutput_I(X, Y, W, H, L);
+ _p = new fltk3::ClockOutput_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
@@ -102,13 +102,14 @@
Fl_Clock() { /* empty */ }
Fl_Clock(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Clock_I(X, Y, W, H, L);
+ _p = new fltk3::Clock_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Fl_Clock(uchar t, int X, int Y, int W, int H, const char *L) {
- _p = new fltk3::Clock(t, X, Y, W, H, L);
+ _p = new fltk3::Clock(t, _ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
+ box((Fl_Boxtype)t);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Color_Chooser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Color_Chooser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Color_Chooser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -100,7 +100,7 @@
Fl_Color_Chooser() { /* empty */ }
Fl_Color_Chooser(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::ColorChooser_I(X, Y, W, H, L);
+ _p = new fltk3::ColorChooser_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Counter.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Counter.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Counter.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -50,7 +50,7 @@
Fl_Counter() { /* empty */ }
Fl_Counter(int X, int Y, int W, int H, const char* L = 0) {
- _p = new fltk3::Counter(X, Y, W, H, L);
+ _p = new fltk3::Counter(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Dial.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Dial.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -63,7 +63,7 @@
Fl_Dial() { /* empty */ }
Fl_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::Dial_I(x, y, w, h, l);
+ _p = new fltk3::Dial_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Double_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Double_Window.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Double_Window.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -67,7 +67,7 @@
}
Fl_Double_Window(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::DoubleWindow_I(X, Y, W, H, l);
+ _p = new fltk3::DoubleWindow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_File_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_File_Browser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_File_Browser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -51,7 +51,7 @@
Fl_File_Browser() { /* empty */ }
Fl_File_Browser(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::FileBrowser_I(x, y, w, h, label);
+ _p = new fltk3::FileBrowser_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_File_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_File_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_File_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -49,7 +49,7 @@
Fl_File_Input() { /* empty */ }
Fl_File_Input(int X, int Y, int W, int H, const char *L=0) {
- _p = new fltk3::FileInput_I(X, Y, W, H, L);
+ _p = new fltk3::FileInput_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Fill_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Fill_Dial.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Fill_Dial.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Fill_Dial() { /* empty */ }
Fl_Fill_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::FillDial_I(x, y, w, h, l);
+ _p = new fltk3::FillDial_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Fill_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Fill_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Fill_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Fill_Slider() { /* empty */ }
Fl_Fill_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::FillSlider(x, y, w, h, l);
+ _p = new fltk3::FillSlider(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Float_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Float_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Float_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Float_Input() { /* empty */ }
Fl_Float_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::FloatInput_I(X, Y, W, H, l);
+ _p = new fltk3::FloatInput_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Gl_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Gl_Window.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Gl_Window.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -54,7 +54,7 @@
Fl_Gl_Window() { /* empty */ }
Fl_Gl_Window(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::GLWindow_I(X, Y, W, H, l);
+ _p = new fltk3::GLWindow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Group.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Group.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Group.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -69,7 +69,7 @@
FLTK3_WIDGET_VCALLS(Fl_Group, Group)
Fl_Group(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Group_I(x, y, w, h, label);
+ _p = new fltk3::Group_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Help_View.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Help_View.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Help_View.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -136,7 +136,7 @@
FLTK3_WIDGET_VCALLS(Fl_Help_View, HelpView)
Fl_Help_View(int xx, int yy, int ww, int hh, const char *l = 0) {
- _p = new fltk3::HelpView_I(xx, yy, ww, hh, l);
+ _p = new fltk3::HelpView_I(_ctor_dx(xx), _ctor_dy(yy), ww, hh, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hold_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hold_Browser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Hold_Browser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Hold_Browser() { /* empty */ }
Fl_Hold_Browser(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HoldBrowser_I(X, Y, W, H, l);
+ _p = new fltk3::HoldBrowser_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Hor_Fill_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Hor_Fill_Slider() { /* empty */ }
Fl_Hor_Fill_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::HorFillSlider_I(x, y, w, h, l);
+ _p = new fltk3::HorFillSlider_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Hor_Nice_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Hor_Nice_Slider() {}
Fl_Hor_Nice_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::HorNiceSlider_I(x, y, w, h, l);
+ _p = new fltk3::HorNiceSlider_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Hor_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Hor_Slider() {}
Fl_Hor_Slider(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HorSlider_I(X, Y, W, H, l);
+ _p = new fltk3::HorSlider_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H 2012-05-12
13:44:11 UTC (rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Hor_Value_Slider.H 2012-05-12
22:34:42 UTC (rev 9486)
@@ -47,7 +47,7 @@
Fl_Hor_Value_Slider() {}
Fl_Hor_Value_Slider(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::HorValueSlider_I(X, Y, W, H, l);
+ _p = new fltk3::HorValueSlider_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Input.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -47,7 +47,7 @@
Fl_Input() { /* empty */ }
Fl_Input(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Input_I(x, y, w, h, label);
+ _p = new fltk3::Input_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Input_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input_.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Input_.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -115,7 +115,7 @@
Fl_Input_() { /* empty */ }
Fl_Input_(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::Input__I(x, y, w, h, label);
+ _p = new fltk3::Input__I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Input_Choice.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Input_Choice.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Input_Choice.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -58,7 +58,7 @@
Fl_Input_Choice() { /* empty */ }
Fl_Input_Choice (int x,int y,int w,int h,const char*l=0) {
- _p = new fltk3::InputChoice_I(x, y, w, h, l);
+ _p = new fltk3::InputChoice_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Int_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Int_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Int_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Int_Input() { /* empty */ }
Fl_Int_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::IntInput_I(X, Y, W, H, l);
+ _p = new fltk3::IntInput_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Light_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Light_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Light_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -49,7 +49,7 @@
Fl_Light_Button() { /* empty */ }
Fl_Light_Button(int x,int y,int w,int h,const char *l = 0) {
- _p = new fltk3::LightButton_I(x, y, w, h, l);
+ _p = new fltk3::LightButton_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Line_Dial.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Line_Dial.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Line_Dial.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Line_Dial() { /* empty */ }
Fl_Line_Dial(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::LineDial_I(x, y, w, h, l);
+ _p = new fltk3::LineDial_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Menu_.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -48,7 +48,7 @@
Fl_Menu_() { /* empty */ }
Fl_Menu_(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::Menu__I(x, y, w, h, label);
+ _p = new fltk3::Menu__I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Bar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Bar.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Menu_Bar.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Menu_Bar() {}
Fl_Menu_Bar(int X, int Y, int W, int H,const char *l=0) {
- _p = new fltk3::MenuBar_I(X, Y, W, H, l);
+ _p = new fltk3::MenuBar_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Menu_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -59,7 +59,7 @@
FLTK3_WIDGET_VCALLS(Fl_Menu_Button, MenuButton)
Fl_Menu_Button(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::MenuButton_I(x, y, w, h, label);
+ _p = new fltk3::MenuButton_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Menu_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Menu_Window.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Menu_Window.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -73,7 +73,7 @@
}
Fl_Menu_Window(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::MenuWindow_I(X, Y, W, H, l);
+ _p = new fltk3::MenuWindow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
};
Modified: branches/branch-3.0/include/FL/Fl_Multi_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multi_Browser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Multi_Browser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Multi_Browser() {}
Fl_Multi_Browser(int X,int Y,int W,int H,const char *L=0) {
- _p = new fltk3::MultiBrowser_I(X, Y, W, H, L);
+ _p = new fltk3::MultiBrowser_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Multiline_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multiline_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Multiline_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Multiline_Input() { /* empty */ }
Fl_Multiline_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::MultilineInput_I(X, Y, W, H, l);
+ _p = new fltk3::MultilineInput_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Multiline_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Multiline_Output.H 2012-05-12
13:44:11 UTC (rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Multiline_Output.H 2012-05-12
22:34:42 UTC (rev 9486)
@@ -47,7 +47,7 @@
Fl_Multiline_Output() { /* emty */ }
Fl_Multiline_Output(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::MultilineOutput_I(X, Y, W, H, l);
+ _p = new fltk3::MultilineOutput_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Nice_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Nice_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Nice_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -45,7 +45,7 @@
FLTK3_WIDGET_VCALLS(Fl_Nice_Slider, NiceSlider)
Fl_Nice_Slider(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::NiceSlider_I(x, y, w, h, l);
+ _p = new fltk3::NiceSlider_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Output.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Output.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -47,7 +47,7 @@
Fl_Output() { /* empty */ }
Fl_Output(int X,int Y,int W,int H, const char *l = 0) {
- _p = new fltk3::Output_I(X, Y, W, H, l);
+ _p = new fltk3::Output_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Overlay_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Overlay_Window.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Overlay_Window.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -65,7 +65,7 @@
}
Fl_Overlay_Window(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::OverlayWindow_I(X, Y, W, H, l);
+ _p = new fltk3::OverlayWindow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Pack.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Pack.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Pack.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -52,7 +52,7 @@
Fl_Pack() {}
Fl_Pack(int x,int y,int w ,int h,const char *l = 0) {
- _p = new fltk3::PackedGroup_I(x, y, w, h, l);
+ _p = new fltk3::PackedGroup_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Positioner.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Positioner.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Positioner.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -59,7 +59,7 @@
Fl_Positioner() { }
Fl_Positioner(int x,int y,int w,int h, const char *l=0) {
- _p = new fltk3::Positioner_I(x, y, w, h, l);
+ _p = new fltk3::Positioner_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Progress.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Progress.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Progress.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Progress() { }
Fl_Progress(int x, int y, int w, int h, const char *l = 0) {
- _p = new fltk3::Progress(x, y, w, h, l);
+ _p = new fltk3::Progress(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Radio_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Radio_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -50,7 +50,7 @@
Fl_Radio_Button() { /* empty */ }
Fl_Radio_Button(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::RadioButton_I(x, y, w, h, l);
+ _p = new fltk3::RadioButton_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H 2012-05-12
13:44:11 UTC (rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Radio_Light_Button.H 2012-05-12
22:34:42 UTC (rev 9486)
@@ -47,7 +47,7 @@
Fl_Radio_Light_Button() { /* blank */ }
Fl_Radio_Light_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::RadioLightButton_I(X, Y, W, H, l);
+ _p = new fltk3::RadioLightButton_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H 2012-05-12
13:44:11 UTC (rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Radio_Round_Button.H 2012-05-12
22:34:42 UTC (rev 9486)
@@ -47,7 +47,7 @@
Fl_Radio_Round_Button() {}
Fl_Radio_Round_Button(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::RadioRoundButton_I(x, y, w, h, l);
+ _p = new fltk3::RadioRoundButton_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Repeat_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Repeat_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Repeat_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -49,7 +49,7 @@
Fl_Repeat_Button() {}
Fl_Repeat_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::RepeatButton_I(X, Y, W, H, l);
+ _p = new fltk3::RepeatButton_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Return_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Return_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Return_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Return_Button() {}
Fl_Return_Button(int X, int Y, int W, int H,const char *l=0) {
- _p = new fltk3::ReturnButton_I(X, Y, W, H, l);
+ _p = new fltk3::ReturnButton_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Roller.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Roller.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Roller.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -47,7 +47,7 @@
Fl_Roller() {}
Fl_Roller(int X,int Y,int W,int H,const char* L=0) {
- _p = new fltk3::Roller_I(X, Y, W, H, L);
+ _p = new fltk3::Roller_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Round_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Round_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Round_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Round_Button() {}
Fl_Round_Button(int x,int y,int w,int h,const char *l = 0) {
- _p = new fltk3::RoundButton_I(x, y, w, h, l);
+ _p = new fltk3::RoundButton_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Round_Clock.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Round_Clock.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Round_Clock.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -45,7 +45,7 @@
FLTK3_WIDGET_VCALLS(Fl_Round_Clock, RoundClock)
Fl_Round_Clock(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::RoundClock_I(x, y, w, h, l);
+ _p = new fltk3::RoundClock_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Scroll.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Scroll.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Scroll.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -59,7 +59,7 @@
Fl_Scroll() {}
Fl_Scroll(int X,int Y,int W,int H,const char*l=0) {
- _p = new fltk3::ScrollGroup_I(X, Y, W, H, l);
+ _p = new fltk3::ScrollGroup_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Scrollbar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Scrollbar.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Scrollbar.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Scrollbar() { /* empty */ }
Fl_Scrollbar(int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Scrollbar_I(X, Y, W, H, L);
+ _p = new fltk3::Scrollbar_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Secret_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Secret_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Secret_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Secret_Input() {}
Fl_Secret_Input(int X,int Y,int W,int H,const char *l = 0) {
- _p = new fltk3::SecretInput_I(X, Y, W, H, l);
+ _p = new fltk3::SecretInput_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Select_Browser.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Select_Browser.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Select_Browser.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Select_Browser() {}
Fl_Select_Browser(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::SelectBrowser_I(X, Y, W, H, l);
+ _p = new fltk3::SelectBrowser_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Simple_Counter.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Simple_Counter.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Simple_Counter.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Simple_Counter() {}
Fl_Simple_Counter(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::SimpleCounter_I(x, y, w, h, l);
+ _p = new fltk3::SimpleCounter_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Single_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Single_Window.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Single_Window.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -62,7 +62,7 @@
}
Fl_Single_Window(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::SingleWindow_I(X, Y, W, H, l);
+ _p = new fltk3::SingleWindow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Slider.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Slider.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -67,13 +67,14 @@
Fl_Slider() { /* empty */ }
Fl_Slider(int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Slider_I(X, Y, W, H, L);
+ _p = new fltk3::Slider_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Fl_Slider(uchar t, int X,int Y,int W,int H, const char *L = 0) {
- _p = new fltk3::Slider_I(t, X, Y, W, H, L);
+ _p = new fltk3::Slider_I(t, _ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
+ box((Fl_Boxtype)t);
}
void bounds(double a, double b) {
Modified: branches/branch-3.0/include/FL/Fl_Spinner.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Spinner.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Spinner.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -47,7 +47,7 @@
Fl_Spinner() {}
Fl_Spinner(int X, int Y, int W, int H, const char *L = 0) {
- _p = new fltk3::Spinner_I(X, Y, W, H, L);
+ _p = new fltk3::Spinner_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Sys_Menu_Bar.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -49,7 +49,7 @@
FLTK3_WIDGET_VCALLS(Fl_Sys_Menu_Bar, SysMenuBar)
Fl_Sys_Menu_Bar(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::SysMenuBar_I(x, y, w, h, l);
+ _p = new fltk3::SysMenuBar_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Table.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Table.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -101,7 +101,7 @@
FLTK3_WIDGET_VCALLS(Fl_Table, Table)
Fl_Table(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::Table_I(X, Y, W, H, l);
+ _p = new fltk3::Table_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Table_Row.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Table_Row.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Table_Row.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -65,7 +65,7 @@
FLTK3_WIDGET_VCALLS(Fl_Table_Row, TableRow)
Fl_Table_Row(int X, int Y, int W, int H, const char *l=0) {
- _p = new fltk3::TableRow_I(X, Y, W, H, l);
+ _p = new fltk3::TableRow_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Tabs.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tabs.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Tabs.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -69,7 +69,7 @@
Fl_Tabs() {}
Fl_Tabs(int x, int y, int w, int h, const char *label=0) {
- _p = new fltk3::TabGroup_I(x, y, w, h, label);
+ _p = new fltk3::TabGroup_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Text_Display.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Text_Display.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Text_Display.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -90,7 +90,7 @@
Fl_Text_Display() {}
Fl_Text_Display(int X, int Y, int W, int H, const char *l = 0) {
- _p = new fltk3::TextDisplay_I(X, Y, W, H, l);
+ _p = new fltk3::TextDisplay_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Text_Editor.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Text_Editor.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Text_Editor.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -61,7 +61,7 @@
Fl_Text_Editor() { /* empty */ }
Fl_Text_Editor(int X, int Y, int W, int H, const char* l = 0) {
- _p = new fltk3::TextEditor_I(X, Y, W, H, l);
+ _p = new fltk3::TextEditor_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Tile.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tile.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Tile.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -47,7 +47,7 @@
Fl_Tile() {}
Fl_Tile(int X,int Y,int W,int H,const char*l=0) {
- _p = new fltk3::TiledGroup_I(X, Y, W, H, l);
+ _p = new fltk3::TiledGroup_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Timer.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Timer.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Timer.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -50,8 +50,9 @@
FLTK3_WIDGET_VCALLS(Fl_Timer, Timer)
Fl_Timer(uchar t,int x,int y,int w,int h, const char *l) {
- _p = new fltk3::Timer_I(t, x, y, w, h, l);
+ _p = new fltk3::Timer_I(t, _ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
+ box(t);
}
Fl_Timer() {}
Modified: branches/branch-3.0/include/FL/Fl_Toggle_Button.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Toggle_Button.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Toggle_Button.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Toggle_Button() {}
Fl_Toggle_Button(int X,int Y,int W,int H,const char *l=0) {
- _p = new fltk3::ToggleButton_I(X, Y, W, H, l);
+ _p = new fltk3::ToggleButton_I(_ctor_dx(X), _ctor_dy(Y), W, H, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Tree.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Tree.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Tree.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -96,7 +96,7 @@
FLTK3_WIDGET_VCALLS(Fl_Tree, Tree)
Fl_Tree(int X, int Y, int W, int H, const char *L=0) {
- _p = new fltk3::Tree_I(X, Y, W, H, L);
+ _p = new fltk3::Tree_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Valuator.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Valuator.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Valuator.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Valuator() { /* empty */ }
Fl_Valuator(int X, int Y, int W, int H, const char* L) {
- _p = new fltk3::Valuator_I(X, Y, W, H, L);
+ _p = new fltk3::Valuator_I(_ctor_dx(X), _ctor_dy(Y), W, H, L);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Value_Input.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Input.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Value_Input.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -48,7 +48,7 @@
Fl_Value_Input() {}
Fl_Value_Input(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::ValueInput_I(x, y, w, h, l);
+ _p = new fltk3::ValueInput_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Value_Output.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Output.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Value_Output.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -45,7 +45,7 @@
FLTK3_WIDGET_VCALLS(Fl_Value_Output, ValueOutput)
Fl_Value_Output(int x,int y,int w,int h,const char *l=0) {
- _p = new fltk3::ValueOutput_I(x, y, w, h, l);
+ _p = new fltk3::ValueOutput_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Value_Slider.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Value_Slider.H 2012-05-12 13:44:11 UTC
(rev 9485)
+++ branches/branch-3.0/include/FL/Fl_Value_Slider.H 2012-05-12 22:34:42 UTC
(rev 9486)
@@ -47,7 +47,7 @@
Fl_Value_Slider() {}
Fl_Value_Slider(int x,int y,int w,int h, const char *l = 0) {
- _p = new fltk3::ValueSlider_I(x, y, w, h, l);
+ _p = new fltk3::ValueSlider_I(_ctor_dx(x), _ctor_dy(y), w, h, l);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Widget.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Widget.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Widget.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -32,6 +32,7 @@
#include <fltk3/Wrapper.h>
#include <fltk3/Widget.h>
+#include <fltk3/Group.h>
#include "Enumerations.H"
#include "Fl_Image.H"
@@ -87,6 +88,22 @@
protected:
+ int _ctor_dx(int x) {
+ fltk3::Group *cg = fltk3::Group::current();
+ if (cg && !cg->as_window()) {
+ x -= cg->dx_window();
+ }
+ return x;
+ }
+
+ int _ctor_dy(int y) {
+ fltk3::Group *cg = fltk3::Group::current();
+ if (cg && !cg->as_window()) {
+ y -= cg->dy_window();
+ }
+ return y;
+ }
+
void x(int v) {
((fltk3::Widget_I*)_p)->x(v);
}
@@ -179,7 +196,7 @@
Fl_Widget() { /*blank */ }
Fl_Widget(int x, int y, int w, int h, const char *label=0L) {
- _p = new fltk3::Widget_I(x, y, w, h, label);
+ _p = new fltk3::Widget_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Window.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Window.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Window.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -65,7 +65,7 @@
}
Fl_Window(int x, int y, int w, int h, const char* label = 0) {
- _p = new fltk3::Window_I(x, y, w, h, label);
+ _p = new fltk3::Window_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
Modified: branches/branch-3.0/include/FL/Fl_Wizard.H
===================================================================
--- branches/branch-3.0/include/FL/Fl_Wizard.H 2012-05-12 13:44:11 UTC (rev
9485)
+++ branches/branch-3.0/include/FL/Fl_Wizard.H 2012-05-12 22:34:42 UTC (rev
9486)
@@ -45,7 +45,7 @@
FLTK3_WIDGET_VCALLS(Fl_Wizard, WizardGroup)
Fl_Wizard(int x, int y, int w, int h, const char *label = 0) {
- _p = new fltk3::WizardGroup_I(x, y, w, h, label);
+ _p = new fltk3::WizardGroup_I(_ctor_dx(x), _ctor_dy(y), w, h, label);
_p->wrapper(this);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
