diff --git a/src/Fl_Browser.cxx b/src/Fl_Browser.cxx index ac4970341..bb3c56d55 100644 --- a/src/Fl_Browser.cxx +++ b/src/Fl_Browser.cxx @@ -44,6 +44,11 @@ #define SELECTED 1 #define NOTDISPLAYED 2 +// WARNING: +// Fl_File_Chooser.cxx also has a definition of this structure (FL_BLINE). +// Changes to FL_BLINE *must* be reflected in Fl_File_Chooser.cxx as well. +// This hack in Fl_File_Chooser should be solved. +// struct FL_BLINE { // data is in a linked list of these FL_BLINE* prev; FL_BLINE* next; @@ -367,8 +372,7 @@ int Fl_Browser::item_height(void *item) const { fl_font(textfont(), textsize()); int hh = fl_height(); if (hh > hmax) hmax = hh; - } - else { + } else { const int* i = column_widths(); // do each column separately as they may all set different fonts: for (char* str = l->txt; str && *str; str++) { diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx index 08f51f7c3..d19a19231 100644 --- a/src/Fl_File_Browser.cxx +++ b/src/Fl_File_Browser.cxx @@ -81,6 +81,11 @@ #define SELECTED 1 #define NOTDISPLAYED 2 +// TODO -- Warning: The definition of FL_BLINE here is a hack. +// Fl_File_Browser should not do this. PLEASE FIX. +// FL_BLINE should be private to Fl_Browser, and not re-defined here. +// For now, make sure this struct is precisely consistent with Fl_Browser.cxx. +// struct FL_BLINE // data is in a linked list of these { FL_BLINE *prev; // Previous item in list