mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added warnings re: duplicate definition of Fl_Browser.cxx's private FL_BLINE

Browse Source 
struct in Fl_File_Browser.cxx.

Currently changes to one struct must be manually kept in sync with the other.

todo: Fl_File_Browser should be fixed to not do this.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6853 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Greg Ercolano 2009-09-09 05:16:41 +00:00
parent 0e29d4a553
commit ee1cd223a9
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Fl_Browser.cxx
View File

@ -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++) {

5
src/Fl_File_Browser.cxx
View File

@ -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