From e8eccde8db246d262d7a9e1c6088cc24e82c84e8 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 19 Jul 2023 20:41:58 +0200 Subject: FLUID: RTTI improvements, 'is_a90' now const, apply RTTI --- fluid/Fl_Function_Type.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'fluid/Fl_Function_Type.cxx') diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index 0dfcea456..5b646790a 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -45,7 +45,7 @@ Fl_Class_Type *current_class = NULL; int has_toplevel_function(const char *rtype, const char *sig) { Fl_Type *child; for (child = Fl_Type::first; child; child = child->next) { - if (!child->is_in_class() && (child->id() == Fl_Type::ID_Function)) { + if (!child->is_in_class() && child->is_a(Fl_Type::ID_Function)) { const Fl_Function_Type *fn = (const Fl_Function_Type*)child; if (fn->has_signature(rtype, sig)) return 1; @@ -525,7 +525,7 @@ void Fl_Function_Type::write_code2(Fd_Code_Writer& f) { char havechildren = 0; for (child = next; child && child->level > level; child = child->next) { havechildren = 1; - if (child->is_window() && child->name()) var = child->name(); + if (child->is_a(ID_Window) && child->name()) var = child->name(); } if (ismain()) { @@ -1982,7 +1982,7 @@ void Fl_Class_Type::write_code2(Fd_Code_Writer& f) { int Fl_Class_Type::has_function(const char *rtype, const char *sig) const { Fl_Type *child; for (child = next; child && child->level > level; child = child->next) { - if (child->level == level+1 && (child->id() == Fl_Type::ID_Function)) { + if (child->level == level+1 && child->is_a(Fl_Type::ID_Function)) { const Fl_Function_Type *fn = (const Fl_Function_Type*)child; if (fn->has_signature(rtype, sig)) return 1; -- cgit v1.2.3