Fixed build error in msvs because Fl ref to FULLSCREEN enum was not accessible in Fl_Widget. new inline is_fullscreen() getter has been implemented to avoid a build error with (at least) msvc compilers. Fixed a ton of warnings / problems when bilding on windows 64 bits target with ms toolchain. cleaned up about 200 warnings raised when building win74 targets.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9325 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 4 insertions, 4 deletions

diff --git a/src/scandir_win32.c b/src/scandir_win32.c
index d9388c6ae..190af8bb9 100644
--- a/src/scandir_win32.c
+++ b/src/scandir_win32.c
@@ -35,7 +35,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
   struct dirent **dir = 0, *selectDir;
   unsigned long ret;
 
-  len    = strlen(dirname);
+  len    = (int) strlen(dirname);
   findIn = (char *)malloc((size_t)(len+10));
   if (!findIn) return -1;
   strcpy(findIn, dirname);
@@ -58,10 +58,10 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
      /* unsigned short * wbuf = (unsigned short*)malloc(sizeof(short) *(len + 10)); */
      /* wbuf[fl_utf2unicode(findIn, strlen(findIn), wbuf)] = 0; */
 	unsigned short *wbuf = NULL;
-	unsigned wlen = fl_utf8toUtf16(findIn, strlen(findIn), NULL, 0); /* Pass NULL to query length */
+	unsigned wlen = fl_utf8toUtf16(findIn, (unsigned) strlen(findIn), NULL, 0); /* Pass NULL to query length */
 	wlen++; /* add a little extra for termination etc. */
 	wbuf = (unsigned short*)malloc(sizeof(unsigned short)*wlen);
-	wlen = fl_utf8toUtf16(findIn, strlen(findIn), wbuf, wlen); /* actually convert the filename */
+	wlen = fl_utf8toUtf16(findIn, (unsigned) strlen(findIn), wbuf, wlen); /* actually convert the filename */
 	wbuf[wlen] = 0; /* NULL terminate the resultant string */
 	h = FindFirstFileW(wbuf, &findw); /* get a handle to the first filename in the search */
 	free(wbuf); /* release the "wide" buffer before the pointer goes out of scope */
@@ -76,7 +76,7 @@ int fl_scandir(const char *dirname, struct dirent ***namelist,
     return nDir;
   }
   do {
-	int l = wcslen(findw.cFileName);
+	int l = (int) wcslen(findw.cFileName);
 	int dstlen = l * 5 + 1;
 	selectDir=(struct dirent*)malloc(sizeof(struct dirent)+dstlen);