mirror of https://github.com/fltk/fltk
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:
parent
2d2b24b781
commit
2ab7525eb3
|
@ -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));
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue