summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-02-20 12:43:36 +0100
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2023-02-20 12:43:36 +0100
commit6f4cf105b13bf138d592327315441c1ae74ca4bb (patch)
tree3d3948ae3f93e8df00fbf1ee6cd734999bd95254
parentb8d2359a3c641a6881403120e241dfb0b397ba39 (diff)
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.
-rw-r--r--src/Fl_Native_File_Chooser_WIN32.cxx2
-rw-r--r--src/fl_dnd_win32.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_Native_File_Chooser_WIN32.cxx b/src/Fl_Native_File_Chooser_WIN32.cxx
index 901c8fbf6..f33af11c8 100644
--- a/src/Fl_Native_File_Chooser_WIN32.cxx
+++ b/src/Fl_Native_File_Chooser_WIN32.cxx
@@ -375,7 +375,7 @@ static void RestoreCWD(char *thecwd) {
// SHOW FILE BROWSER
int Fl_WinAPI_Native_File_Chooser_Driver::showfile() {
- bool unixpath = IsUnixPath(_directory) | IsUnixPath(_preset_file); // caller uses unix paths?
+ bool unixpath = IsUnixPath(_directory) || IsUnixPath(_preset_file); // caller uses unix paths?
ClearOFN();
clear_pathnames();
size_t fsize = FNFC_MAX_PATH;
diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx
index 5a4408191..9e69c290a 100644
--- a/src/fl_dnd_win32.cxx
+++ b/src/fl_dnd_win32.cxx
@@ -433,7 +433,7 @@ public:
class FLDataObject : public IDataObject
{
DWORD m_cRefCount;
- FLEnum *m_EnumF;
+ //FLEnum *m_EnumF;
public:
FLDataObject() { m_cRefCount = 1; }// m_EnumF = new FLEnum();}
virtual ~FLDataObject() { }