diff options
| author | Manolo Gouy <Manolo> | 2015-12-18 18:56:58 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-12-18 18:56:58 +0000 |
| commit | 43bfe74b25d0b7709757037a13c8ee2118bb8588 (patch) | |
| tree | 3b73cd48622f7b642618c296e79a182549db6bc9 /fluid/Fl_Type.h | |
| parent | 5c7ef303413c03a0c5f645276e9c2b7ae8289680 (diff) | |
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
Diffstat (limited to 'fluid/Fl_Type.h')
| -rw-r--r-- | fluid/Fl_Type.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fluid/Fl_Type.h b/fluid/Fl_Type.h index 0b90cb63b..2a66c5f05 100644 --- a/fluid/Fl_Type.h +++ b/fluid/Fl_Type.h @@ -30,6 +30,7 @@ #include <FL/Fl_Plugin.H> #include "Fluid_Image.h" #include <FL/fl_draw.H> +#include <stdarg.h> void set_modflag(int mf); @@ -813,6 +814,7 @@ int write_declare(const char *, ...) __fl_attr((__format__ (__printf__, 1, 2))); int is_id(char); const char* unique_id(void* o, const char*, const char*, const char*); void write_c(const char*, ...) __fl_attr((__format__ (__printf__, 1, 2))); +void vwrite_c(const char* format, va_list args); void write_h(const char*, ...) __fl_attr((__format__ (__printf__, 1, 2))); void write_cstring(const char *); void write_cstring(const char *,int length); |
