diff options
| -rw-r--r-- | FL/Fl_Native_File_Chooser_FLTK.H | 4 | ||||
| -rw-r--r-- | src/fl_utf.c | 6 | ||||
| -rw-r--r-- | src/xutf8/ucs2fontmap.c | 6 | ||||
| -rw-r--r-- | test/device.cxx | 4 | ||||
| -rw-r--r-- | test/preferences.fl | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/FL/Fl_Native_File_Chooser_FLTK.H b/FL/Fl_Native_File_Chooser_FLTK.H index ad511666a..e97ffb037 100644 --- a/FL/Fl_Native_File_Chooser_FLTK.H +++ b/FL/Fl_Native_File_Chooser_FLTK.H @@ -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() diff --git a/src/fl_utf.c b/src/fl_utf.c index 7e858c1e1..ff13404c0 100644 --- a/src/fl_utf.c +++ b/src/fl_utf.c @@ -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; } diff --git a/src/xutf8/ucs2fontmap.c b/src/xutf8/ucs2fontmap.c index 3f2175762..fe3150ba4 100644 --- a/src/xutf8/ucs2fontmap.c +++ b/src/xutf8/ucs2fontmap.c @@ -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$". diff --git a/test/device.cxx b/test/device.cxx index bd613a238..050b159cd 100644 --- a/test/device.cxx +++ b/test/device.cxx @@ -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; -}; +} diff --git a/test/preferences.fl b/test/preferences.fl index 0190f6651..be093b3a8 100644 --- a/test/preferences.fl +++ b/test/preferences.fl @@ -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 } } |