From 91c3b8231de57e381d33b154852092c04ab96f14 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 15 Apr 2005 20:45:07 +0000 Subject: Fix subclass callback output code. Make fltk-config script executable after rerunning configure script. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4286 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- Makefile | 1 + fluid/Fl_Widget_Type.cxx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d283d8876..7008ad3f8 100644 --- a/Makefile +++ b/Makefile @@ -85,6 +85,7 @@ makeinclude: configure configh.in makeinclude.in ./configure; \ fi touch config.h + chmod +x fltk-config configure: configure.in autoconf diff --git a/fluid/Fl_Widget_Type.cxx b/fluid/Fl_Widget_Type.cxx index da406eff9..624408049 100644 --- a/fluid/Fl_Widget_Type.cxx +++ b/fluid/Fl_Widget_Type.cxx @@ -1496,7 +1496,7 @@ void Fl_Widget_Type::write_static() { if (k) { write_c("void %s::%s(%s* o, %s v) {\n", k, cn, t, ut); write_c(" ((%s*)(o->", k); - for (Fl_Type* p = parent; p->is_widget(); p = p->parent) + for (Fl_Type* p = parent; p && p->is_widget(); p = p->parent) write_c("parent()->"); write_c("user_data()))->%s_i(o,v);\n}\n", cn); } -- cgit v1.2.3