diff options
| author | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
|---|---|---|
| committer | Fabien Costantini <fabien@onepost.net> | 2012-04-05 05:12:30 +0000 |
| commit | 8809c5d65dd20895dcae90e9d2af05fd271f2e9e (patch) | |
| tree | d53cbf6d921ae68bda31b6c5d522dc8c87ee9bd1 /src/Fl_Native_File_Chooser_WIN32.cxx | |
| parent | 37ea8ba9e635e9655417714bd49ab7bb2b36beb5 (diff) | |
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
Diffstat (limited to 'src/Fl_Native_File_Chooser_WIN32.cxx')
| -rw-r--r-- | src/Fl_Native_File_Chooser_WIN32.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx index 5366b70f9..44404ffe8 100644 --- a/src/Fl_Native_File_Chooser_WIN32.cxx +++ b/src/Fl_Native_File_Chooser_WIN32.cxx @@ -86,7 +86,7 @@ static int dnulllen(const char *wp) { // static void dnullcat(char*&wp, const char *string, int n = -1 ) { //DEBUG printf("DEBUG: dnullcat IN: <"); dnullprint(wp); printf(">\n"); - int inlen = ( n < 0 ) ? strlen(string) : n; + size_t inlen = ( n < 0 ) ? strlen(string) : n; if ( ! wp ) { wp = new char[inlen + 4]; *(wp+0) = '\0'; @@ -114,7 +114,7 @@ static void dnullcat(char*&wp, const char *string, int n = -1 ) { } } - if ( n == -1 ) n = strlen(string); + if ( n == -1 ) n = (int) strlen(string); strncpy(wp2, string, n); // Leave string double-null terminated @@ -306,7 +306,7 @@ int Fl_Native_File_Chooser::showfile() { } // SPACE FOR RETURNED FILENAME _ofn.lpstrFile = new WCHAR[fsize]; - _ofn.nMaxFile = fsize-1; + _ofn.nMaxFile = (DWORD) fsize-1; _ofn.lpstrFile[0] = 0; _ofn.lpstrFile[1] = 0; // dnull // PARENT WINDOW @@ -326,7 +326,7 @@ int Fl_Native_File_Chooser::showfile() { const char *p = _parsedfilt; while(*(p + strlen(p) + 1) != 0) p += strlen(p) + 1; p += strlen(p) + 2; - MultiByteToWideChar(CP_UTF8, 0, _parsedfilt, p - _parsedfilt, wpattern, FNFC_MAX_PATH); + MultiByteToWideChar(CP_UTF8, 0, _parsedfilt, (int) (p - _parsedfilt), wpattern, FNFC_MAX_PATH); _ofn.lpstrFilter = wpattern; } else { _ofn.lpstrFilter = NULL; @@ -407,7 +407,7 @@ int Fl_Native_File_Chooser::showfile() { case BROWSE_MULTI_FILE: { // EXTRACT MULTIPLE FILENAMES const WCHAR *dirname = _ofn.lpstrFile; - int dirlen = wcslen(dirname); + size_t dirlen = wcslen(dirname); if ( dirlen > 0 ) { // WALK STRING SEARCHING FOR 'DOUBLE-NULL' // eg. "/dir/name\0foo1\0foo2\0foo3\0\0" |