mirror of https://github.com/fltk/fltk
#840: Generously adds Fl::args_to_utf8() for MinGW support.
This commit is contained in:
parent
fdf578d936
commit
04a5098a58
|
@ -676,6 +676,7 @@ int main(int argc,char **argv) {
|
||||||
check_write_permissions(g_system_write_ok, g_user_write_ok);
|
check_write_permissions(g_system_write_ok, g_user_write_ok);
|
||||||
|
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
int args_processed = Fl::args(argc, argv, i, read_command_line_args);
|
int args_processed = Fl::args(argc, argv, i, read_command_line_args);
|
||||||
if (args_processed < argc) {
|
if (args_processed < argc) {
|
||||||
fprintf(stderr, "ERROR: Unrecognized command line option \"%s\".\n", argv[i]);
|
fprintf(stderr, "ERROR: Unrecognized command line option \"%s\".\n", argv[i]);
|
||||||
|
|
|
@ -2171,6 +2171,7 @@ int main(int argc,char **argv) {
|
||||||
setlocale(LC_NUMERIC, "C"); // make sure numeric values are written correctly
|
setlocale(LC_NUMERIC, "C"); // make sure numeric values are written correctly
|
||||||
g_launch_path = end_with_slash(fl_getcwd()); // store the current path at launch
|
g_launch_path = end_with_slash(fl_getcwd()); // store the current path at launch
|
||||||
|
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if ( (Fl::args(argc,argv,i,arg) == 0) // unsupported argument found
|
if ( (Fl::args(argc,argv,i,arg) == 0) // unsupported argument found
|
||||||
|| (batch_mode && (i != argc-1)) // .fl filename missing
|
|| (batch_mode && (i != argc-1)) // .fl filename missing
|
||||||
|| (!batch_mode && (i < argc-1)) // more than one filename found
|
|| (!batch_mode && (i < argc-1)) // more than one filename found
|
||||||
|
|
|
@ -160,6 +160,7 @@ void wtype_cb(Fl_Widget *, void *) {
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
int i;
|
int i;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
||||||
const char *fname = (i < argc) ? argv[i] : "browser.cxx";
|
const char *fname = (i < argc) ? argv[i] : "browser.cxx";
|
||||||
Fl_Double_Window window(720, 520, fname);
|
Fl_Double_Window window(720, 520, fname);
|
||||||
|
|
|
@ -56,6 +56,7 @@ static RGBdb rgbdb[MAX_RGB];
|
||||||
|
|
||||||
int main(int argc, char *argv[]) {
|
int main(int argc, char *argv[]) {
|
||||||
int i;
|
int i;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
||||||
const char *dbname = (i < argc) ? argv[i] : "rgb.txt";
|
const char *dbname = (i < argc) ? argv[i] : "rgb.txt";
|
||||||
|
|
||||||
|
|
|
@ -601,6 +601,7 @@ int main(int argc, char **argv) {
|
||||||
// parse commandline
|
// parse commandline
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if (!Fl::args(argc, argv, i) || i < argc-1)
|
if (!Fl::args(argc, argv, i) || i < argc-1)
|
||||||
Fl::fatal("Usage: %s <switches> <menufile>\n%s", argv[0], Fl::help);
|
Fl::fatal("Usage: %s <switches> <menufile>\n%s", argv[0], Fl::help);
|
||||||
if (i < argc) {
|
if (i < argc) {
|
||||||
|
|
|
@ -333,6 +333,7 @@ void create_the_forms() {
|
||||||
|
|
||||||
int main(int argc, char **argv) {
|
int main(int argc, char **argv) {
|
||||||
Fl::scheme(NULL);
|
Fl::scheme(NULL);
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
Fl::args(argc, argv);
|
Fl::args(argc, argv);
|
||||||
Fl::get_system_colors();
|
Fl::get_system_colors();
|
||||||
create_the_forms();
|
create_the_forms();
|
||||||
|
|
|
@ -47,6 +47,7 @@ main(int argc, // I - Number of command-line arguments
|
||||||
Fl_GIF_Image::animate = true; // create animated shared .GIF images
|
Fl_GIF_Image::animate = true; // create animated shared .GIF images
|
||||||
Fl_Help_Dialog *help = new Fl_Help_Dialog;
|
Fl_Help_Dialog *help = new Fl_Help_Dialog;
|
||||||
int i;
|
int i;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
if (!Fl::args(argc, argv, i)) Fl::fatal(Fl::help);
|
||||||
const char *fname = (i < argc) ? argv[i] : "help_dialog.html";
|
const char *fname = (i < argc) ? argv[i] : "help_dialog.html";
|
||||||
|
|
||||||
|
|
|
@ -421,6 +421,7 @@ static int arg(int argc, char** argv, int& i) {
|
||||||
// registered tests to the browser widget.
|
// registered tests to the browser widget.
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
int i;
|
int i;
|
||||||
|
Fl::args_to_utf8(argc, argv); // for MSYS2/MinGW
|
||||||
if ( Fl::args(argc,argv,i,arg) == 0 ) { // unsupported argument found
|
if ( Fl::args(argc,argv,i,arg) == 0 ) { // unsupported argument found
|
||||||
static const char *msg =
|
static const char *msg =
|
||||||
"usage: %s <switches>\n"
|
"usage: %s <switches>\n"
|
||||||
|
|
Loading…
Reference in New Issue