From 3346a9fee75faff9b8087513204cb63cfcf8ec0c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Sun, 14 Jul 2002 17:03:31 +0000 Subject: Change the Fl_Group current, add, and remove methods so they are no longer inline; this should make shared libraries work better on all platforms. Link FLUID against shared libraries, too, so that the installed fluid is also using shared libraries (still make a statically linked fluid for the build) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2525 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_Group.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/Fl_Group.cxx') diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx index e844a81a8..1c9b36620 100644 --- a/src/Fl_Group.cxx +++ b/src/Fl_Group.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Group.cxx,v 1.8.2.8.2.15 2002/07/11 22:43:52 matthiaswm Exp $" +// "$Id: Fl_Group.cxx,v 1.8.2.8.2.16 2002/07/14 17:03:31 easysw Exp $" // // Group widget for the Fast Light Tool Kit (FLTK). // @@ -49,11 +49,12 @@ int Fl_Group::find(const Fl_Widget* o) const { return i; } -// Kludge: Metrowerks CodeWarrior can't export static class member: current_ -#ifdef __MWERKS__ +// Metrowerks CodeWarrior and others can't export the static +// class member: current_, so these methods can't be inlined... void Fl_Group::begin() {current_ = this;} void Fl_Group::end() {current_ = (Fl_Group*)parent();} -#endif +Fl_Group *Fl_Group::current() {return current_;} +void Fl_Group::current(Fl_Group *g) {current_ = g;} extern Fl_Widget* fl_oldfocus; // set by Fl::focus @@ -586,5 +587,5 @@ void Fl_Group::draw_outside_label(const Fl_Widget& w) const { } // -// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.15 2002/07/11 22:43:52 matthiaswm Exp $". +// End of "$Id: Fl_Group.cxx,v 1.8.2.8.2.16 2002/07/14 17:03:31 easysw Exp $". // -- cgit v1.2.3