mirrors
/
fltk
mirror of https://github.com/fltk/fltk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few GNU compiler warnings (-pedantic): C++ comments in C files, 

extraneous ';' and ',' and an invalid cast.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8263 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2011-01-11 20:52:38 +00:00
parent 9c0c450cbd
commit b4c15eb8ae
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
FL/Fl_Native_File_Chooser_FLTK.H
View File

@ -3,7 +3,7 @@
//
// FLTK native OS file chooser widget
//
// Copyright 1998-2010 by Bill Spitzak and others.
// Copyright 1998-2011 by Bill Spitzak and others.
// Copyright 2005 by Nathan Vander Wilt.
//
// This library is free software; you can redistribute it and/or
@ -93,7 +93,7 @@ public:
NO_OPTIONS = 0x0000, ///< no options enabled
SAVEAS_CONFIRM = 0x0001, ///< Show native 'Save As' overwrite confirm dialog (if supported)
NEW_FOLDER = 0x0002, ///< Show 'New Folder' icon (if supported)
PREVIEW = 0x0004, ///< enable preview mode
PREVIEW = 0x0004 ///< enable preview mode
};
private:
int _btype; // kind-of browser to show()

6
src/fl_utf.c
View File

@ -3,7 +3,7 @@
*
* This is the utf.c file from fltk2 adapted for use in my fltk1.1 port
*/
/* Copyright 2006-2010 by Bill Spitzak and others.
/* Copyright 2006-2011 by Bill Spitzak and others.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@ -751,7 +751,7 @@ unsigned fl_utf8to_mb(const char* src, unsigned srclen,
memcpy(dst, src, srclen);
dst[srclen] = 0;
} else {
// Buffer insufficent or buffer query
/* Buffer insufficent or buffer query */
}
return srclen;
}
@ -815,7 +815,7 @@ unsigned fl_utf8from_mb(char* dst, unsigned dstlen,
memcpy(dst, src, srclen);
dst[srclen] = 0;
} else {
// Buffer insufficent or buffer query
/* Buffer insufficent or buffer query */
}
return srclen;
}

6
src/xutf8/ucs2fontmap.c
View File

@ -36,7 +36,7 @@ typedef struct {
unsigned short used;
} Summary16;
#define NEED_TOMB // indicates what part of these include files is needed here (avoid compilation warnings)
#define NEED_TOMB /* indicates what part of these include files is needed here (avoid compilation warnings) */
#include "lcUniConv/cp936ext.h"
#include "lcUniConv/big5.h"
#include "lcUniConv/gb2312.h"
@ -305,7 +305,7 @@ int ucs2fontmap(char *s, unsigned int ucs, int enc) {
break;
};
return -1;
};
}
/*const*/
int encoding_number(const char *enc) {
@ -373,7 +373,7 @@ int encoding_number(const char *enc) {
return 26;
};
return -1;
};
}
/*
* End of "$Id$".

4
test/device.cxx
View File

@ -608,7 +608,7 @@ void print(Fl_Widget *, void *w) {
p->end_job();
}
delete p;
};
}
/*void print2(Fl_Widget *, void *w) {
Fl_Widget * g = (Fl_Widget *)w;
@ -731,4 +731,4 @@ b_bitmap.labelcolor(FL_GREEN);
Fl::run();
return 0;
};
}

2
test/preferences.fl
View File

@ -323,6 +323,6 @@ Function {writePrefs()} {open return_type void
/* sample code only: */
unsigned int hex = 0x2387efcd;
eat.set( "binFoo", (void*)&hex, sizeof( unsigned int ) );
eat.set( "binFoo2", (void*)&writePrefs, 256 );} {selected
eat.set( "binFoo2", (void*)&bed, 256 );} {selected
}
}