Commit Graph

55 Commits

Author SHA1 Message Date
ManoloFLTK
6f4cf105b1 Remove 2 compilation warnings under Windows with mingw64
Compiling Fl_Native_File_Chooser_WIN32.cxx...
fl_dnd_win32.cxx:436:11: warning: private field 'm_EnumF' is not used [-Wunused-private-field]
  FLEnum *m_EnumF;
          ^
1 warning generated.

Fl_Native_File_Chooser_WIN32.cxx:378:19: warning: use of bitwise '|' with boolean operands [-Wbitwise-instead-of-logical]
  bool unixpath = IsUnixPath(_directory) | IsUnixPath(_preset_file);    // caller uses unix paths?
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                         ||
Fl_Native_File_Chooser_WIN32.cxx:378:19: note: cast one or both operands to int to silence this warning
1 warning generated.
2023-02-20 12:43:36 +01:00
Matthias Melcher
44c874b731
Use FL_OVERRIDE for all overridden virtual methods (#611)
FL_OVERRIDE is defined as `override` for C++11 and higher
FL_OVERRIDE is defined as `override` for VisualC 2015 and newer
Don't interfere with Fl_Widget::override()
2022-12-30 19:14:36 +01:00
ManoloFLTK
2ffd4e4f1a Replace all calls to sprintf() by calls to snprintf(). 2022-09-26 16:12:18 +02:00
Albrecht Schlosser
92e9181a0a Rename FL/fl_string.h to FL/fl_string_functions.h
This is part 1 of the final fix for a previous name clash on case
insensitive file systems (fl_string.h vs. Fl_String.H).
2022-01-16 19:47:16 +01:00
Albrecht Schlosser
dc13b56915 Fix compiler warnings (Windows only)
src/Fl_Native_File_Chooser_WIN32.cxx:331:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
  331 |   while ( s=strchr(s,'\\') ) *s = '/';
      |           ~^~~~~~~~~~~~~~~

src/Fl_Native_File_Chooser_WIN32.cxx:336:12: warning: suggest parentheses around assignment used as truth value [-Wparentheses]
  336 |   while ( s=strchr(s,'/') ) *s = '\\';
      |           ~^~~~~~~~~~~~~~
2021-08-30 14:16:49 +02:00
Albrecht Schlosser
1bd57a20e6 Windows: Fix compiler warning, simplify code
src/Fl_Native_File_Chooser_WIN32.cxx:190:10:
  warning: ‘char* strncpy(char*, const char*, size_t)’ specified bound
  depends on the length of the source argument [-Wstringop-overflow=]
  190 |   strncpy(wp2, string, n);
      |   ~~~~~~~^~~~~~~~~~~~~~~~

Although there was no real problem with the code (the allocated buffer
was large enough), the code was questionable and there was redundant
code that could be simplified.
2021-05-31 14:14:37 +02:00
Albrecht Schlosser
72901a626c Fix potential buffer overrun (WIN32 only) 2021-04-16 18:08:15 +02:00
Greg Ercolano
4951fd1801 Better fix for issue #206.
Albrecht caught a problem with my strncat use (see comments for 12d8da9c).

I noticed we have fl_strlcpy() and fl_strlcat() which is what was really
needed here.
2021-03-23 18:27:30 -07:00
Greg Ercolano
12d8da9cb6 Solve issue #206 warning. 2021-03-23 12:24:04 -07:00
ComputerNerd
34da17cd85 Set errmsg to exterr instead of err which will always be zero. 2020-12-13 21:15:47 -06:00
Albrecht Schlosser
340e2ac3a1 Fix .clang-format and some whitespace errors
.clang-format: UseTab: ForIndentation -> Never

Update fluid generated files
2020-08-22 13:35:42 +02:00
Greg Ercolano
0da41da713 Allow unix style paths for windows native filechooser
Allows and preserves unix style paths if user specifies them,
otherwise uses Windows style. This allows end users to use either
style path and get behavior they expect in cross-platform environments.

Addresses problems raised by issue #122
2020-08-08 19:10:57 -07:00
Greg Ercolano
b105dd726f Error string that was created is now saved with errmsg() 2020-08-07 16:29:52 -07:00
Albrecht Schlosser
f09e17c3c5 Remove $Id$ tags, update URL's, and more
- remove obsolete svn '$Id$' tags from all source files
- update .fl files and generated files accordingly
- replace 'http://www.fltk.org' URL's with 'https://...'
- replace bug report URL 'str.php' with 'bugs.php'
- remove trailing whitespace
- fix other whitespace errors flagged by Git
- add and/or fix missing or wrong standard headers
- convert tabs to spaces in all source files

The only relevant code changes are in the fluid/ folder where
some .fl files and other source files were used to generate
the '$Id' headers and footers.
2020-07-06 20:28:20 +02:00
Albrecht Schlosser
42d8aba117 Replace FL/x.H with FL/platform.H - step 2 (STR #3435).
This second step replaces FL/x.H with FL/platform.H in all source files.
Dependencies have been adjusted as well.

This commit completes the replacement of FL/x.H with FL/platform.H.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12641 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2018-01-31 21:17:17 +00:00
Albrecht Schlosser
ad967af70c Fix confusing (QT style) doxygen comment marker.
Add a space between '/*' and '!'.
Other changes: comment alignment.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12494 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2017-10-14 08:35:38 +00:00
Greg Ercolano
108e6d7b0d Bringing over fix [r11920] from 1.3 current to the porting branch.
Fixes STR#3200 issue with filter() on Win32.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11922 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-09-05 16:56:54 +00:00
Greg Ercolano
509ed5962a Bringing over fix [r11188] from 1.3 current to the porting branch.
Some code cleanup of FNFC Win32: no functional changes.
 
     > Replace huge static WCHAR wpattern[] array with dynamic in win32 FNFC (ABI 1.3.4)
       (Should decrease the memory weight WIN32 lib)
 
     > Simplify current working directory management
 
     > Comment simplification, CMP adherence
 



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11831 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-07-20 02:25:15 +00:00
Manolo Gouy
f8104524e8 Use more consistent naming for derived classes of Fl_Native_File_Chooser_Driver.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11628 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-16 08:37:15 +00:00
Manolo Gouy
fa67aafa9d Rewrite the Fl_File_Native_Chooser class under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11529 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-04-05 11:25:35 +00:00
Albrecht Schlosser
29a9e89b39 Remove FLTK_ABI_VERSION from all but *tree*.* and documentation.
Everything related to Fl_Tree and its test and demo programs has been
cleaned.

Documentation needs updates.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11428 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-03-26 02:55:14 +00:00
Albrecht Schlosser
e9395133e3 Fix Windows compilation error in Fl_Native_File_Chooser_WIN32.cxx.
Fix regression (typo) introduced in svn r11086.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11089 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-30 01:20:40 +00:00
Matthias Melcher
40e9ae6e61 Fixed a few warnings from a picky compiler setting.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11086 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-29 20:50:04 +00:00
Ian MacArthur
e2cc1a80f0 Some trivial adjustments to support building
under Win32/mingw with the configure/make
on Win7 with Msys.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11073 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2016-01-28 11:18:01 +00:00
Manolo Gouy
335927ab90 Fix for STR #3221: restore the correct state of mouse buttons and keyboard modifier keys
after closing a non-FLTK window (file or printer dialogs).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10713 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2015-04-22 14:40:01 +00:00
Manolo Gouy
f2bb3ea76c The Fl_Native_File_Chooser class contains, under WIN32, two system-defined structures
(OPENFILENAMEW and BROWSEINFOW). This forces any application program that uses
Fl_Native_File_Chooser to include file windows.h.
This is corrected by using in the Fl_Native_File_Chooser class pointers to the 2 structures.
The changes are protected by #if FLTK_ABI_VERSION >= 10304 for ABI compatibility.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10437 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-11-06 21:33:09 +00:00
Pierre Ossman
61e1b18f7b Consolidate the Win32 init and cleanup code in to one place so
it's easier to keep track of it.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10312 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-09-15 09:35:05 +00:00
Greg Ercolano
018f4ee978 Removed unused code strcnt() to prevent warnings w/mingw
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10222 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-07-21 18:05:25 +00:00
Greg Ercolano
574c174dd7 Fix for STR #3101 to handle e.g. "foo.f[ld]" filters properly.
(Was only counting ',' style filters, not character oriented filters)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10216 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-07-01 01:43:33 +00:00
Manolo Gouy
0f4fa1633d Changes brought in at r. 10046 make fluid crash when open or saving files with Fl_Native_File_Chooser
on the WIN32 platform.
The filter used by fluid "FLUID files \t*.f[ld]/n" makes Fl_Native_File_Chooser::parse_filter() crash.
The present changes TEMPORARILY avoid this crash, but r. 10046 changes should be closely reviewed.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10215 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-06-30 13:39:09 +00:00
Manolo Gouy
87fe066c29 It's probably better to also change SendMessage into SendMessageW
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10208 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-06-24 15:23:51 +00:00
Manolo Gouy
10caca062a Fixed error when browsing for a directory and using a non-ascii starting directory.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10207 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-06-24 15:06:24 +00:00
Ian MacArthur
abb91eed73 Partial fix for STR #3044.
Fixes typo in a DEBUG section of Fl_Native_File_Chooser_WIN32.cxx



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10138 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-05-01 09:00:30 +00:00
Greg Ercolano
ebd1e106aa Fixes STR#3041, int -> size_t
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10086 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-27 02:16:24 +00:00
Manolo Gouy
f1bc3999d6 Two functions strcnt() with distinct prototypes where defined and only one was used,
causing a -Wunused-function warning. Also strcnt() is used in WIN32 only, so should not
belong to Fl_Native_File_Chooser_common.cxx that contains functions used across
platforms.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10064 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-16 16:10:19 +00:00
Greg Ercolano
70865d6c10 Fixes STR# 3025; string overflow with large filter()s.
Replaced fixed arrays with dynamic strings.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10046 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-06 17:52:06 +00:00
Greg Ercolano
8ecd7a1abb Fix mem leak with 'oldcwd' if user hits 'cancel' button in browser..
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10045 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2014-01-06 01:01:52 +00:00
Ian MacArthur
998020f758 Remove a header file I added during testing, but which is not required now...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9933 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-06-06 12:59:24 +00:00
Ian MacArthur
c9598ade18 Attempt to fix UTF8 encoding of WIN32 Native File Chooser BROWSE_DIRECTORY options
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9931 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2013-06-06 12:10:44 +00:00
Greg Ercolano
4b80dde748 Imported Walter Garms' comments re:BIF_SHAREABLE from the
./TODO file that came with the original version of FNFC.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9629 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-06-26 07:03:46 +00:00
Fabien Costantini
d90b170c8d Fixed more warnings in VC2010 32+64 bits builds
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9395 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2012-04-24 03:34:26 +00:00
Fabien Costantini
8809c5d65d 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
2012-04-05 05:12:30 +00:00
Greg Ercolano
6b1db04a80 Small fix: typo affected string length calc.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9175 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-11-13 09:13:26 +00:00
Greg Ercolano
7f556fde4a Solve STR #2733: MAX_PATH too small on Win32 (260 chars!)
Removed some hardcoded arrays in favor of dynamic,
and created a new macro with 32768 and used it for remaining pathname arrays.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9174 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-11-13 07:33:50 +00:00
Greg Ercolano
e0e04cc956 Solve STR #2768: WIN32 file filter pulldown menu was not showing wildcard patterns.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9173 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-11-13 07:25:36 +00:00
Greg Ercolano
4f4a8fc3c7 Modifications to all LGPL headers for STR #2685.
(to clarify static exception LGPL by changing license references)



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8864 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-07-19 04:49:30 +00:00
Manolo Gouy
287f5684ee Fix STR #2569 cont'd: put back MSWindows version of Fl_Native_File_Chooser::filters()
that had been erroneously removed by r.8378 that merged include files (it was
previously an inline function).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8454 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2011-02-20 21:46:11 +00:00
Albrecht Schlosser
ef831abaa7 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
2010-12-08 13:16:27 +00:00
Greg Ercolano
4327734e69 More copyright 2010 mods.
Used: vi `grep -r 'Copyright .*Spitzak' . | grep -v 2010 | grep -v '/\.svn' | cut -d: -f1`


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7913 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-11-29 18:18:27 +00:00
Albrecht Schlosser
b010bce1af Fixed unbalanced Windows OleInitialize/OleUnitialize calls
when loading/unloading the FLTK dll (STR #2417)


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7706 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
2010-09-27 14:57:53 +00:00