From 43bfe74b25d0b7709757037a13c8ee2118bb8588 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Fri, 18 Dec 2015 18:56:58 +0000
Subject: 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
---
 fluid/code.cxx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'fluid/code.cxx')

diff --git a/fluid/code.cxx b/fluid/code.cxx
index 10d62cdf5..02cc439bc 100644
--- a/fluid/code.cxx
+++ b/fluid/code.cxx
@@ -254,14 +254,18 @@ void write_cdata(const char *s, int length) {
   putc('}', code_file);
 }
 
-void write_c(const char* format,...) {
+void vwrite_c(const char* format, va_list args) {
   if (varused_test) {
     varused = 1;
     return;
   }
+  vfprintf(code_file, format, args);
+}
+
+void write_c(const char* format,...) {
   va_list args;
   va_start(args, format);
-  vfprintf(code_file, format, args);
+  vwrite_c(format, args);
   va_end(args);
 }
 
-- 
cgit v1.2.3