mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Treat all "Window" classed widgets as window widgets. 

Don't automatically include non-FLTK headers.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2006-10-20 00:34:48 +00:00
parent 2d2b24b781
commit 2ab7525eb3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fluid/Fl_Widget_Type.cxx
View File

@ -1866,7 +1866,9 @@ int isdeclare(const char *c) {
void Fl_Widget_Type::write_static() {
const char* t = subclassname(this);
if (!subclass() || is_class()) write_declare("#include <FL/%s.H>", t);
if (!subclass() || (is_class() && !strncmp(t, "Fl_", 3))) {
write_declare("#include <FL/%s.H>", t);
}
for (int n=0; n < NUM_EXTRA_CODE; n++) {
if (extra_code(n) && isdeclare(extra_code(n)))
write_declare("%s", extra_code(n));

5
fluid/Fl_Window_Type.cxx
View File

@ -1418,10 +1418,7 @@ void Fl_Widget_Class_Type::write_code1() {
if (!c) c = "Fl_Group";
write_h("\nclass %s : public %s {\n", name(), c);
if (!strcmp(c, "Fl_Window") ||
!strcmp(c, "Fl_Double_Window") ||
!strcmp(c, "Fl_Gl_Window") ||
!strcmp(c, "Fl_Overlay_Window")) {
if (strstr(c, "Window")) {
write_h(" void _%s();\n", name());
write_h("public:\n");
write_h(" %s(int X, int Y, int W, int H, const char *L = 0);\n", name());