From 4e66f937698fd0792c17db2085d99ee5985c81ff Mon Sep 17 00:00:00 2001 From: Bill Spitzak Date: Tue, 11 May 1999 09:39:31 +0000 Subject: Missing header files and FL_EXTERNs that prevented DLL's from compiling under BCC. Fluid will output A::B::C names for nested classes. Fl_Browser::lineposition(n, BOTTOM) will align the bottom of the line rather than the top with the bottom of the browser. The connect program does wait() so that it does not leave a zombie for every one of your ppp connections. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@584 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- fluid/Fl_Function_Type.cxx | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'fluid') diff --git a/fluid/Fl_Function_Type.cxx b/fluid/Fl_Function_Type.cxx index 8a45b941b..a811e60f5 100644 --- a/fluid/Fl_Function_Type.cxx +++ b/fluid/Fl_Function_Type.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Function_Type.cxx,v 1.15.2.2 1999/04/30 16:29:40 gustavo Exp $" +// "$Id: Fl_Function_Type.cxx,v 1.15.2.3 1999/05/11 09:39:28 bill Exp $" // // C function type code for the Fast Light Tool Kit (FLTK). // @@ -543,7 +543,22 @@ void Fl_DeclBlock_Type::write_code2() { const char* Fl_Type::class_name() const { Fl_Type* p = parent; - while (p) {if (p->is_class()) return p->name(); p = p->parent;} + while (p) { + if (p->is_class()) { + // see if we are nested in another class, we must fully-qualify name: + // this is lame but works... + const char* q = p->class_name(); + if (q) { + static char buffer[256]; + if (q != buffer) strcpy(buffer, q); + strcat(buffer, "::"); + strcat(buffer, p->name()); + return buffer; + } + return p->name(); + } + p = p->parent; + } return 0; } @@ -638,5 +653,5 @@ void Fl_Class_Type::write_code2() { } // -// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.2 1999/04/30 16:29:40 gustavo Exp $". +// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.3 1999/05/11 09:39:28 bill Exp $". // -- cgit v1.2.3