gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo and debug output when loading libgtk

Browse Source 
A recent commit changed the library name, supposedly unintended.

While testing I found that the debug statements generated confusing
output (both "selected GTK-3" and "selected GTK-2") when GTK-3 was
available.
This commit is contained in:
Albrecht Schlosser 2019-10-30 19:00:12 +01:00
parent 98f16ae397
commit 1f9d027bb6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/drivers/X11/Fl_X11_System_Driver.cxx
View File

@ -529,7 +529,7 @@ bool Fl_X11_System_Driver::probe_for_GTK(int major, int minor, void **ptr_gtk) {
*ptr_gtk = RTLD_DEFAULT; // Caution: NULL under linux, not-NULL under Darwin
} else {
// Try first with GTK3
*ptr_gtk = Fl::system_driver()->dlopen("libgtk3.0.so");
*ptr_gtk = Fl::system_driver()->dlopen("libgtk-3.so");
if (*ptr_gtk) {
#ifdef DEBUG
puts("selected GTK-3\n");
@ -537,12 +537,13 @@ bool Fl_X11_System_Driver::probe_for_GTK(int major, int minor, void **ptr_gtk) {
} else {
// Try then with GTK2
*ptr_gtk = Fl::system_driver()->dlopen("libgtk-x11-2.0.so");
}
if (*ptr_gtk) {
#ifdef DEBUG
puts("selected GTK-2\n");
if (*ptr_gtk) {
puts("selected GTK-2\n");
}
#endif
} else {
}
if (!(*ptr_gtk)) {
#ifdef DEBUG
puts("Failure to load libgtk");
#endif