Author: matt
Date: 2012-05-29 14:21:00 -0700 (Tue, 29 May 2012)
New Revision: 9558
Log:
Fluid3 fix
Modified:
branches/branch-3.0/fluid/Fl_Group_Type.cxx
branches/branch-3.0/fluid/factory.cxx
branches/branch-3.0/fluid/function_panel.cxx
Modified: branches/branch-3.0/fluid/Fl_Group_Type.cxx
===================================================================
--- branches/branch-3.0/fluid/Fl_Group_Type.cxx 2012-05-29 21:17:12 UTC (rev
9557)
+++ branches/branch-3.0/fluid/Fl_Group_Type.cxx 2012-05-29 21:21:00 UTC (rev
9558)
@@ -78,9 +78,9 @@
for (Fl_Type *nn = t->first_child(); nn; nn = nn->next_brother()) {
if (nn->is_widget()) {
fltk3::Widget* o = ((Fl_Widget_Type*)nn)->o;
- int x = o->x(); if (x+X0 < X)
+ int x = o->x(); if (x+X0 < X)
X = x+X0;
- int y = o->y(); if (y+Y0 < Y) Y = y+Y0;
+ int y = o->y(); if (y+Y0 < Y) Y = y+Y0;
int r = o->r(); if (r+X0 > R)
R = r+X0;
int b = o->b(); if (b+Y0 > B) B = b+Y0;
Modified: branches/branch-3.0/fluid/factory.cxx
===================================================================
--- branches/branch-3.0/fluid/factory.cxx 2012-05-29 21:17:12 UTC (rev
9557)
+++ branches/branch-3.0/fluid/factory.cxx 2012-05-29 21:21:00 UTC (rev
9558)
@@ -74,7 +74,7 @@
////////////////////////////////////////////////////////////////
-#include <fltk3/Box.h>
+#include <fltk3/Widget.h>
class Fl_Box_Type : public Fl_Widget_Type {
public:
virtual const char *type_name() {return "fltk3::Widget";}
Modified: branches/branch-3.0/fluid/function_panel.cxx
===================================================================
--- branches/branch-3.0/fluid/function_panel.cxx 2012-05-29 21:17:12 UTC
(rev 9557)
+++ branches/branch-3.0/fluid/function_panel.cxx 2012-05-29 21:21:00 UTC
(rev 9558)
@@ -1025,7 +1025,7 @@
} // fltk3::Group* o
{ fltk3::Group* o = new fltk3::Group(515, 3, 55, 79);
{ fltk3::Button* o = new fltk3::Button(2, 2, 24, 24);
- o->tooltip("Box");
+ o->tooltip("Widget");
o->box(fltk3::THIN_UP_BOX);
o->callback((fltk3::Callback*)type_make_cb, (void*)("fltk3::Widget"));
o->image(pixmap[5]);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
