diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-09-16 12:14:22 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2020-09-16 12:15:54 +0200 |
| commit | c9bee9ba8068bb11a61ff4a8ee64d01abce79b4a (patch) | |
| tree | 54605e773a5b7bc354a9909ee2e7d9aa1e68d141 /fluid | |
| parent | e2a249fca99ab91e1bc472e3379c5bcad715221f (diff) | |
Fix fluid output for international languages
The fluid version and other values in .fl files are written as float
values which means that locale settings apply since we enabled the
locale with "setlocale()".
Update the "rebuild" target in fluid and src folders to update
the fluid (.fl) files and related {.cxx|.h} files.
Diffstat (limited to 'fluid')
| -rw-r--r-- | fluid/Makefile | 28 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/fluid/Makefile b/fluid/Makefile index 6c1469581..2823e5f4d 100644 --- a/fluid/Makefile +++ b/fluid/Makefile @@ -1,7 +1,7 @@ # -# FLUID makefile for the Fast Light Tool Kit (FLTK). +# FLUID Makefile for the Fast Light Tool Kit (FLTK). # -# Copyright 1998-2017 by Bill Spitzak and others. +# Copyright 1998-2020 by Bill Spitzak and others. # # This library is free software. Distribution and use rights are outlined in # the file "COPYING" which should have been included with this file. If this @@ -120,16 +120,16 @@ uninstall-linux: uninstall-osx: $(RM) -r $(DESTDIR)/Applications/fluid.app - -# # Note: The rebuild target can only be used if you have the original .fl -# files. This is normally only used by the FLTK maintainers... -# - -rebuild: - ./fluid -u -c about_panel.fl - ./fluid -u -c alignment_panel.fl - ./fluid -u -c function_panel.fl - ./fluid -u -c print_panel.fl - ./fluid -u -c template_panel.fl - ./fluid -u -c widget_panel.fl +# files. This is normally only used by the FLTK maintainers... +# It *must* be executed *after* fluid has been built and +# fluid must be rebuilt if any {.fl|.cxx|.h} files were changed. + +rebuild: fluid$(EXEEXT) + echo 'Rebuilding fluid (.fl) and .cxx/.h files from .fl files ...' + ./fluid$(EXEEXT) -u -c about_panel.fl + ./fluid$(EXEEXT) -u -c alignment_panel.fl + ./fluid$(EXEEXT) -u -c function_panel.fl + ./fluid$(EXEEXT) -u -c print_panel.fl + ./fluid$(EXEEXT) -u -c template_panel.fl + ./fluid$(EXEEXT) -u -c widget_panel.fl diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index dcea17e7c..1f7e27790 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1750,7 +1750,9 @@ static void sigint(SIGARG) { int main(int argc,char **argv) { int i = 1; - setlocale(LC_ALL, ""); // enable multilanguage errors in file chooser + setlocale(LC_ALL, ""); // enable multilanguage errors in file chooser + setlocale(LC_NUMERIC, "C"); // make sure numeric values are written correctly + if (!Fl::args(argc,argv,i,arg) || i < argc-1) { static const char *msg = "usage: %s <switches> name.fl\n" |