Running FLTK in static initializers (cont'd):

1) Changed the way fluid attaches images to widgets and menu items so
it is compatible with running fluid-generated code containing such images
in a static initializer. Images are now attached calling a function:
  widget->image( image_function_name() );
and this function is defined before in fluid-generated code as:
   static Fl_Image *image_function_name() {
     static Fl_Image *image = new image_type(......);
     return image;
   }

2) Changed src/Fl_File_Chooser.fl so the source code generate by fluid
from it is compatible with running in a static initializer.

3) Changed src/Fl_File_Chooser.cxx and FL/Fl_File_Chooser.H
to the result of running fluid on src/Fl_File_Chooser.fl 

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10972 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 2 insertions, 0 deletions

diff --git a/fluid/Fluid_Image.h b/fluid/Fluid_Image.h
index 7e8cfd53c..f36ec2b1e 100644
--- a/fluid/Fluid_Image.h
+++ b/fluid/Fluid_Image.h
@@ -30,6 +30,7 @@ class Fluid_Image {
   const char *name_;
   int refcount;
   Fl_Shared_Image *img;
+  const char *function_name_;
 protected:
   Fluid_Image(const char *name); // no public constructor
   ~Fluid_Image(); // no public destructor
@@ -41,6 +42,7 @@ public:
   void image(Fl_Widget *); // set the image of this widget
   void deimage(Fl_Widget *); // set the deimage of this widget
   void write_static();
+  void write_initializer(const char *type_name, const char *format, ...);
   void write_code(const char *var, int inactive = 0);
   const char *name() const {return name_;}
 };