Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-23 07:46:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fluid treats any class name for the outer window that does not contain

Browse Source 
the word "Window" as a group that needs a 4-element constructor.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2622 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Bill Spitzak
2002-09-09 02:04:46 +00:00
parent f97b388e38
commit cf16564eda
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluid/Fl_Widget_Type.cxx
+5 -7
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.18 2002/09/04 20:33:17 easysw Exp $"
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.19 2002/09/09 02:04:46 spitzak Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@@ -1491,11 +1491,9 @@ void Fl_Widget_Type::write_code1() {
if (varused) write_c("{ %s* o = ", t);
if (name()) write_c("%s = ", name());
if (is_window()) {
// Handle special case of Fl_Group class type within a window -
// output constructor using x, y, w, h...
if (strcmp(t, "Fl_Group") == 0 ||
strcmp(t, "Fl_Tabs") == 0 ||
strcmp(t, "Fl_Tile") == 0)
// Handle special case where user is faking a Fl_Group type as a window,
// there is no 2-argument constructor in that case:
if (!strstr(t, "Window"))
write_c("new %s(0, 0, %d, %d", t, o->w(), o->h());
else
write_c("new %s(%d, %d", t, o->w(), o->h());
@@ -1972,5 +1970,5 @@ int Fl_Widget_Type::read_fdesign(const char* propname, const char* value) {
}
//
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.18 2002/09/04 20:33:17 easysw Exp $".
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.19 2002/09/09 02:04:46 spitzak Exp $".
//
src/Fl_Tabs.cxx
+5 -7
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.12 2002/09/04 20:33:18 easysw Exp $"
// "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.13 2002/09/09 02:04:46 spitzak Exp $"
//
// Tab widget for the Fast Light Tool Kit (FLTK).
//
@@ -44,7 +44,7 @@
// Return value is the index of the selected item.
int Fl_Tabs::tab_positions(int* p, int* wp) {
int selected = -1;
int selected = 0;
Fl_Widget*const* a = array();
int i;
p[0] = 0;
@@ -78,10 +78,8 @@ int Fl_Tabs::tab_positions(int* p, int* wp) {
if (wp[i] > W) wp[i] = W;
}
// adjust edges according to visiblity:
if (selected >= 0) {
for (i = children(); i > selected; i--) {
p[i] = p[i-1]+wp[i-1];
}
for (i = children(); i > selected; i--) {
p[i] = p[i-1]+wp[i-1];
}
return selected;
}
@@ -302,5 +300,5 @@ Fl_Tabs::Fl_Tabs(int X,int Y,int W, int H, const char *l) :
}
//
// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.12 2002/09/04 20:33:18 easysw Exp $".
// End of "$Id: Fl_Tabs.cxx,v 1.6.2.10.2.13 2002/09/09 02:04:46 spitzak Exp $".
//