|
 |
12e7778 |
diff -rupN gmsh-2.12.0-source/Fltk/FlGui.cpp gmsh-2.12.0-source-new/Fltk/FlGui.cpp
|
|
|
12e7778 |
--- gmsh-2.12.0-source/Fltk/FlGui.cpp 2016-03-05 12:58:58.000000000 +0100
|
|
|
12e7778 |
+++ gmsh-2.12.0-source-new/Fltk/FlGui.cpp 2016-03-06 11:51:12.461853229 +0100
|
|
|
482aba0 |
@@ -370,7 +370,7 @@ FlGui::FlGui(int argc, char **argv)
|
|
|
482aba0 |
// nothing to do here
|
|
|
482aba0 |
#else
|
|
|
482aba0 |
fl_open_display();
|
|
|
482aba0 |
- static char gmsh32x32[] = {
|
|
|
482aba0 |
+ static unsigned char gmsh32x32[] = {
|
|
|
482aba0 |
0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x40, 0x03, 0x00,
|
|
|
482aba0 |
0x00, 0x40, 0x03, 0x00, 0x00, 0x20, 0x07, 0x00, 0x00, 0x20, 0x07, 0x00,
|
|
|
482aba0 |
0x00, 0x10, 0x0f, 0x00, 0x00, 0x10, 0x0f, 0x00, 0x00, 0x08, 0x1f, 0x00,
|
|
|
482aba0 |
@@ -384,7 +384,7 @@ FlGui::FlGui(int argc, char **argv)
|
|
|
482aba0 |
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
|
|
|
482aba0 |
graph[0]->getWindow()->icon
|
|
|
482aba0 |
((const char*)XCreateBitmapFromData(fl_display, DefaultRootWindow(fl_display),
|
|
|
482aba0 |
- gmsh32x32, 32, 32));
|
|
|
482aba0 |
+ reinterpret_cast<char*>(gmsh32x32), 32, 32));
|
|
|
482aba0 |
#endif
|
|
|
482aba0 |
|
|
|
482aba0 |
graph[0]->getWindow()->show(argc >0 ? 1 : 0, argv);
|