mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes so that "extra code" goes before o->end() and close bracket.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@546 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
gustavo 1999-04-18 14:10:55 +00:00
parent c319bcae89
commit 923aa16100
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fluid/Fl_Group_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Group_Type.cxx,v 1.4.2.1 1999/03/29 17:39:24 carl Exp $"
// "$Id: Fl_Group_Type.cxx,v 1.4.2.2 1999/04/18 14:10:55 gustavo Exp $"
//
// Fl_Group object code for the Fast Light Tool Kit (FLTK).
//
@ -121,9 +121,10 @@ void Fl_Group_Type::write_code1() {
}
void Fl_Group_Type::write_code2() {
write_extra_code();
write_c("%so->end();\n", indent());
if (resizable()) write_c("%sFl_Group::current()->resizable(o);\n", indent());
Fl_Widget_Type::write_code2();
write_block_close();
}
////////////////////////////////////////////////////////////////
@ -219,5 +220,5 @@ const char tile_type_name[] = "Fl_Tile";
Fl_Tile_Type Fl_Tile_type; // the "factory"
//
// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.1 1999/03/29 17:39:24 carl Exp $".
// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.2 1999/04/18 14:10:55 gustavo Exp $".
//

6
fluid/Fl_Type.h
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Type.h,v 1.5.2.1 1999/03/29 17:39:25 carl Exp $"
// "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $"
//
// Widget type header file for the Fast Light Tool Kit (FLTK).
//
@ -239,6 +239,8 @@ protected:
void write_static();
void write_code1();
void write_widget_code();
void write_extra_code();
void write_block_close();
void write_code2();
public:
@ -523,5 +525,5 @@ int storestring(const char *n, const char * & p, int nostrip=0);
extern int include_H_from_C;
//
// End of "$Id: Fl_Type.h,v 1.5.2.1 1999/03/29 17:39:25 carl Exp $".
// End of "$Id: Fl_Type.h,v 1.5.2.2 1999/04/18 14:10:53 gustavo Exp $".
//

21
fluid/Fl_Widget_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.1 1999/04/10 09:14:34 bill Exp $"
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
@ -1427,13 +1427,20 @@ void Fl_Widget_Type::write_widget_code() {
write_c("%sw->hotspot(o);\n", indent());
}
void Fl_Widget_Type::write_code2() {
indentation -= 2;
if (!is_parent() && !varused) return;
void Fl_Widget_Type::write_extra_code() {
for (int n=0; n < NUM_EXTRA_CODE; n++)
if (extra_code(n) && !isdeclare(extra_code(n)))
write_c("%s %s\n", indent(), extra_code(n));
write_c("%s}\n", indent());
write_c("%s%s\n", indent(), extra_code(n));
}
void Fl_Widget_Type::write_block_close() {
indentation -= 2;
if (is_parent() || varused) write_c("%s}\n", indent());
}
void Fl_Widget_Type::write_code2() {
write_extra_code();
write_block_close();
}
////////////////////////////////////////////////////////////////
@ -1738,5 +1745,5 @@ int Fl_Widget_Type::read_fdesign(const char* name, const char* value) {
}
//
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.1 1999/04/10 09:14:34 bill Exp $".
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.2 1999/04/18 14:10:53 gustavo Exp $".
//

7
fluid/Fl_Window_Type.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Window_Type.cxx,v 1.13.2.1 1999/03/29 17:39:26 carl Exp $"
// "$Id: Fl_Window_Type.cxx,v 1.13.2.2 1999/04/18 14:10:55 gustavo Exp $"
//
// Window type code for the Fast Light Tool Kit (FLTK).
//
@ -593,13 +593,14 @@ void Fl_Window_Type::write_code1() {
}
void Fl_Window_Type::write_code2() {
write_extra_code();
if (modal) write_c("%so->set_modal();\n", indent());
else if (non_modal) write_c("%so->set_non_modal();\n", indent());
if (!((Fl_Window*)o)->border()) write_c("%so->clear_border();\n", indent());
write_c("%so->end();\n", indent());
if (((Fl_Window*)o)->resizable() == o)
write_c("%so->resizable(o);\n", indent());
Fl_Widget_Type::write_code2();
write_block_close();
}
void Fl_Window_Type::write_properties() {
@ -652,5 +653,5 @@ int Fl_Window_Type::read_fdesign(const char* name, const char* value) {
}
//
// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.1 1999/03/29 17:39:26 carl Exp $".
// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.2 1999/04/18 14:10:55 gustavo Exp $".
//