From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 19 Nov 2012 12:51:54 +0000 (+0000)
Subject: Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/1ec4e9c2b72a01a7ba7da569e0f8d04a81aaba10?ds=inline

Convert wxFSW_EVENT_{WARNING,ERROR} to string correctly.

Previously these types were not handled at all, resulting in asserts.

See #14834.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72986 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/fswatcher/fswatcher.cpp b/samples/fswatcher/fswatcher.cpp
index 3fde2baa26..0c2bdf62ff 100644
--- a/samples/fswatcher/fswatcher.cpp
+++ b/samples/fswatcher/fswatcher.cpp
@@ -537,6 +537,10 @@ static wxString GetFSWEventChangeTypeName(int changeType)
         return "ACCESS";
     case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
         return "ATTRIBUTE";
+    case wxFSW_EVENT_WARNING:
+        return "WARNING";
+    case wxFSW_EVENT_ERROR:
+        return "ERROR";
     }
 
     return "INVALID_TYPE";
diff --git a/src/common/fswatchercmn.cpp b/src/common/fswatchercmn.cpp
index 1fbf26b9ca..dfa8730cf3 100644
--- a/src/common/fswatchercmn.cpp
+++ b/src/common/fswatchercmn.cpp
@@ -42,6 +42,10 @@ static wxString GetFSWEventChangeTypeName(int type)
         return "ACCESS";
     case wxFSW_EVENT_ATTRIB: // Currently this is wxGTK-only
         return "ATTRIBUTE";
+    case wxFSW_EVENT_WARNING:
+        return "WARNING";
+    case wxFSW_EVENT_ERROR:
+        return "ERROR";
     }
 
     // should never be reached!
diff --git a/src/unix/fswatcher_inotify.cpp b/src/unix/fswatcher_inotify.cpp
index 6f02d7071e..bdc0b34530 100644
--- a/src/unix/fswatcher_inotify.cpp
+++ b/src/unix/fswatcher_inotify.cpp
@@ -261,7 +261,7 @@ protected:
         // check out for error/warning condition
         if (flags & wxFSW_EVENT_WARNING || flags & wxFSW_EVENT_ERROR)
         {
-            wxString errMsg = GetErrorDescription(Watcher2NativeFlags(flags));
+            wxString errMsg = GetErrorDescription(nativeFlags);
             wxFileSystemWatcherEvent event(flags, errMsg);
             SendEvent(event);
         }