diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-12-08 13:16:27 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2010-12-08 13:16:27 +0000 |
| commit | ef831abaa73298d9648010d8aede52dc95fcaee1 (patch) | |
| tree | dd595f2c3d0bd5f82ce00d027261a5321c5146d4 /src | |
| parent | 8e0cceff6e15299a7116021df793d1023e7070b1 (diff) | |
Fixed more Windows compiler warnings:
- unused functions: dnullprint, strapp
- format mismatch for newer compilers and/or 64-bit mode
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7977 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Native_File_Chooser_WIN32.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Native_File_Chooser_common.cxx | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index 9b08aff15..d46803c15 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/src/Fl_Native_File_Chooser_WIN32.cxx @@ -50,6 +50,7 @@ char *wchartoutf8(LPCWSTR in); //MG void fl_OleInitialize(); // in Fl.cxx (Windows only) // STATIC: PRINT WINDOWS 'DOUBLE NULL' STRING (DEBUG) +#ifdef DEBUG static void dnullprint(char *wp) { if ( ! wp ) return; for ( int t=0; true; t++ ) { @@ -64,6 +65,7 @@ static void dnullprint(char *wp) { } } } +#endif // RETURN LENGTH OF DOUBLENULL STRING // Includes single nulls in count, excludes trailing doublenull. @@ -633,9 +635,9 @@ void Fl_Native_File_Chooser::add_filter(const char *name_in, // name of filter ( // No name? Make one.. char name[1024]; if ( !name_in || name_in[0] == '\0' ) { - sprintf(name, "%.*s Files", sizeof(name)-10, winfilter); + sprintf(name, "%.*s Files", int(sizeof(name)-10), winfilter); } else { - sprintf(name, "%.*s", sizeof(name)-10, name_in); + sprintf(name, "%.*s", int(sizeof(name)-10), name_in); } dnullcat(_parsedfilt, name); dnullcat(_parsedfilt, winfilter); diff --git a/src/Fl_Native_File_Chooser_common.cxx b/src/Fl_Native_File_Chooser_common.cxx index 70a3eab1c..383ecc86f 100644 --- a/src/Fl_Native_File_Chooser_common.cxx +++ b/src/Fl_Native_File_Chooser_common.cxx @@ -56,6 +56,7 @@ static char *strfree(char *val) { // char *s = strnew("foo"); // s = "foo" // s = strapp(s, "bar"); // s = "foobar" // +#if !defined(WIN32) static char *strapp(char *s, const char *val) { if ( ! val ) { return(s); // Nothing to append? return s @@ -69,6 +70,7 @@ static char *strapp(char *s, const char *val) { delete [] s; // delete old string return(news); // return new copy } +#endif // APPEND A CHARACTER TO A STRING // This does NOT allocate space for the new character. |