From 86532198f0467c6d29090ce7ad95bcb36cd697f6 Mon Sep 17 00:00:00 2001 From: Andrew Deryabin Date: Tue, 3 Feb 2015 06:08:57 +0000 Subject: [PATCH 1/2] Fix for fltk < 1.3 --- src/main.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index ab995ad..18a36d2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -30,6 +30,8 @@ using namespace std; #include #include #include +#include +#include #include #include @@ -97,10 +99,27 @@ static void *mainGuiThread(void *arg) map::iterator it; fl_register_images(); +#if (FL_MAJOR_VERSION == 1 && FL_MINOR_VERSION < 3) + char *fname = tmpnam(NULL); + if(fname) + { + FILE *f = fopen(fname, "wb"); + if(f) + { + fwrite(yoshimi_logo_png, sizeof(yoshimi_logo_png), 1, f); + fclose(f); + } + } + Fl_PNG_Image pix(fname); + if(fname) + unlink(fname); +#else + Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); +#endif Fl_Window winSplash(400, 300, "yoshimi splash screen"); Fl_Box box(0, 0, 400,300); //Fl_Pixmap pix(yoshimi_logo); - Fl_PNG_Image pix("yoshimi_logo_png", yoshimi_logo_png, sizeof(yoshimi_logo_png)); + box.image(pix); Fl_Box boxLb(10, 300-30, 400-20, 30); boxLb.box(FL_NO_BOX); -- 2.2.2