Add wxMoveToTrash function (PR #26256)
Blake-Madden
Moves a file or directory (recursively) into the trash/recycle bin. If it fails, then returns false and leaves the file alone; I thought calling wxRemoveFile as an alternative path upon failure would be too aggressive and arbitrary.
I added implementation details in the docs; we seem to do that with system-level functions like this.
Tested on:
- Windows 11
- Linux Mint
- macOS Catalina
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/26256
Commit Summary
File Changes
(4 files)
- M include/wx/filefn.h (3)
- M interface/wx/filefn.h (25)
- M src/common/filefn.cpp (154)
- M src/osx/cocoa/utils_base.mm (29)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/26256.patch
- https://github.com/wxWidgets/wxWidgets/pull/26256.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
PB
@PBfordev commented on this pull request.
I suppose introducing a new function instead of adding a flag to the existing remove file/folder functions seemed better.
> + // but without separator at the end of the path
+ wxString pathStr(path);
+ if ( pathStr.Last() == wxFILE_SEP_PATH )
+ pathStr.RemoveLast();
+ pathStr += wxT('\0');
+
+ SHFILEOPSTRUCT fileop;
+ wxZeroMemory(fileop);
+ fileop.wFunc = FO_DELETE;
+ fileop.pFrom = pathStr.t_str();
+ fileop.fFlags = FOF_ALLOWUNDO | FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI;
+
+ int ret = SHFileOperation(&fileop);
+ if ( ret != 0 || fileop.fAnyOperationsAborted )
+ {
+ wxLogDebug(wxS("SHFileOperation(FO_DELETE with FOF_ALLOWUNDO) failed: error 0x%08x"),
Why was wxLogDebug() and not wxLogError() used here (and for macOS)? The error is reported to the user in the Linux code path and other wx file functions.
> + else
+ {
+ result += wxString::Format("%%%02X", ch);
+ }
+ ++cur;
+ }
+
+ return result;
+}
+#endif // __UNIX__ && !__WXMAC__
+
+bool wxMoveToTrash(const wxString& path)
+{
+ if ( !wxFileExists(path) && !wxDirExists(path) )
+ {
+ wxLogError(_("'%s' doesn't exist and can't be moved to trash"), path);
⬇️ Suggested change
- wxLogError(_("'%s' doesn't exist and can't be moved to trash"), path);
+ wxLogError(_("'%s' doesn't exist and can't be moved to trash."), path);
AFAICT, the sentences in wxLogError() (but not wxLogSysError()) end with a period elsewhere. Applies to the one at the end of the function as well.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 0e583cc Update src/common/filefn.cpp
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> + // but without separator at the end of the path
+ wxString pathStr(path);
+ if ( pathStr.Last() == wxFILE_SEP_PATH )
+ pathStr.RemoveLast();
+ pathStr += wxT('\0');
+
+ SHFILEOPSTRUCT fileop;
+ wxZeroMemory(fileop);
+ fileop.wFunc = FO_DELETE;
+ fileop.pFrom = pathStr.t_str();
+ fileop.fFlags = FOF_ALLOWUNDO | FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI;
+
+ int ret = SHFileOperation(&fileop);
+ if ( ret != 0 || fileop.fAnyOperationsAborted )
+ {
+ wxLogDebug(wxS("SHFileOperation(FO_DELETE with FOF_ALLOWUNDO) failed: error 0x%08x"),
That's how it's done in wxFileName::Rmdir (src/common/filename.cpp). Not saying that's right or wrong, I just re-used the code from there.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
oneeyeman1
oneeyeman1 left a comment (wxWidgets/wxWidgets#26256)@Blake-Madden ,
Please look at #2517 and try not to repeat the same mistakes I did... ;-)
Thank you.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Thanks, this looks useful, but the error reporting needs to be streamlined.
I'm also not enamored of keeping the code for all platforms but macOS in the same function, it probably would be cleaner to have some wxMoveToTrashImpl() and implement it in MSW/Unix-specific file. But I realize that src/common/filefn.cpp is such a mess that it probably doesn't matter much.
> @@ -641,6 +641,160 @@ bool wxRemoveFile(const wxString& file)
return res == 0;
}
+#if defined(__WXMAC__)
+extern bool wxMoveToTrashOSX(const wxString& path);
+#endif
+
+#if defined(__UNIX__) && !defined(__WXMAC__)
+#include <fcntl.h>
+
+// Percent-encode a file path per RFC 2396 for the FreeDesktop Trash spec.
+static wxString wxTrashUrlEncodePath(const wxString& path)
Could we reuse wxURI::BuildURI() here? It's already supposed to have the correct logic for this.
> + if ( !wxFileName::Mkdir(trashFiles, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + if ( !wxFileName::Mkdir(trashInfo, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false;
Should we create them? Maybe just check if they already exist and bail out if not? Not really sure, maybe this is the right thing to do, but some reference to the docs or whatever would be welcome here.
> + if ( !wxFileName::Mkdir(trashFiles, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + if ( !wxFileName::Mkdir(trashInfo, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + + // Resolve the full absolute path + wxFileName fileName(path); + fileName.MakeAbsolute(); + wxString fullPath = fileName.GetFullPath(); + + // Pick a unique trash name atomically using O_EXCL per the spec + wxString baseName = fileName.GetFullName(); + wxString trashName = baseName; + wxString infoPath; + + for ( int attempt = 2; ; ++attempt )
It seems a bit dangerous to never stop, I'd put an upper bound on the number of attempts here (even if very high, e.g. 1,000,000). But again, I'm not sure what the spec says.
> + // Write the .trashinfo file
+ {
+ wxFile infoFile;
+ if ( !infoFile.Open(infoPath, wxFile::write) )
+ {
+ wxRemoveFile(infoPath);
+ return false;
+ }
+
+ wxString encodedPath = wxTrashUrlEncodePath(fullPath);
+ wxString info = wxString::Format(
+ "[Trash Info]\nPath=%s\nDeletionDate=%s\n",
+ encodedPath,
+ wxDateTime::Now().FormatISOCombined()
+ );
+ infoFile.Write(info);
Should check for error.
> + if ( !ext.empty() )
+ trashName += "." + ext;
+ }
+
+ // Write the .trashinfo file
+ {
+ wxFile infoFile;
+ if ( !infoFile.Open(infoPath, wxFile::write) )
+ {
+ wxRemoveFile(infoPath);
+ return false;
+ }
+
+ wxString encodedPath = wxTrashUrlEncodePath(fullPath);
+ wxString info = wxString::Format(
+ "[Trash Info]\nPath=%s\nDeletionDate=%s\n",
Minor, but this might look better/more clear as a raw string:
⬇️ Suggested change- "[Trash Info]\nPath=%s\nDeletionDate=%s\n", +R"[Trash Info] +Path=%s +DeletionDate=%s +",
> + wxString encodedPath = wxTrashUrlEncodePath(fullPath);
+ wxString info = wxString::Format(
+ "[Trash Info]\nPath=%s\nDeletionDate=%s\n",
+ encodedPath,
+ wxDateTime::Now().FormatISOCombined()
+ );
+ infoFile.Write(info);
+ }
+
+ // Move the file or directory into Trash/files/
+ wxString destPath = trashFiles + "/" + trashName;
+ if ( wxRename(fullPath, destPath) != 0 )
+ {
+ // Move failed (e.g. cross-device) — clean up the .trashinfo
+ wxRemoveFile(infoPath);
+ wxLogSysError(_("'%s' couldn't be moved to trash"), path);
This won't log the correct error because it will have been overwritten by wxRemoveFile(), you need to call this first.
Note that using a scope guard for removing the file would take care of this automatically, as the dtor of the guard would be executed after any normal code.
In src/osx/cocoa/utils_base.mm:
> +bool wxMoveToTrashOSX(const wxString& path)
+{
+ wxCFStringRef cfPath(path);
+ NSURL *fileURL = [NSURL fileURLWithPath:cfPath.AsNSString()];
+ if ( fileURL == nil )
+ return false;
+
+ NSError *error = nil;
+ BOOL ok = [[NSFileManager defaultManager] trashItemAtURL:fileURL
+ resultingItemURL:nil
+ error:&error];
+ if ( !ok )
+ {
+ if ( error )
+ {
+ wxLogDebug("NSFileManager trashItemAtURL failed: %s",
Those should also be replaced with user-readable error messages (i.e. "'%s' couldn't be moved to trash: %s").
> + // but without separator at the end of the path
+ wxString pathStr(path);
+ if ( pathStr.Last() == wxFILE_SEP_PATH )
+ pathStr.RemoveLast();
+ pathStr += wxT('\0');
+
+ SHFILEOPSTRUCT fileop;
+ wxZeroMemory(fileop);
+ fileop.wFunc = FO_DELETE;
+ fileop.pFrom = pathStr.t_str();
+ fileop.fFlags = FOF_ALLOWUNDO | FOF_SILENT | FOF_NOCONFIRMATION | FOF_NOERRORUI;
+
+ int ret = SHFileOperation(&fileop);
+ if ( ret != 0 || fileop.fAnyOperationsAborted )
+ {
+ wxLogDebug(wxS("SHFileOperation(FO_DELETE with FOF_ALLOWUNDO) failed: error 0x%08x"),
I think it was done like this in wxFileName::Rmdir() because it doesn't show user-visible log messages in any case (why is it so is another question...). This function does give errors in the Linux/Unix version and so I agree that this should be a wxLogError() too.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Ian McInerney
imciner2 left a comment (wxWidgets/wxWidgets#26256)Why have you implemented the freedesktop spec directly instead of using something like g_file_trash (https://docs.gtk.org/gio/method.File.trash.html), which I believe implemented that spec also. (note in KiCad we implemented the move to trash functionality by just calling g_file_trash, https://gitlab.com/kicad/code/kicad/-/blob/master/libs/kiplatform/os/unix/environment.cpp?ref_type=heads#L68).
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 9cefb93 Update src/common/filefn.cpp
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)Why have you implemented the freedesktop spec directly instead of using something like
g_file_trash(https://docs.gtk.org/gio/method.File.trash.html), which I believe implemented that spec also. (note in KiCad we implemented the move to trash functionality by just callingg_file_trash, https://gitlab.com/kicad/code/kicad/-/blob/master/libs/kiplatform/os/unix/environment.cpp?ref_type=heads#L68).
I tried that, but would get link errors. Seems that we need to add a GLib/GIO dependency for that, so I went with a different approach.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#26256)I tried that, but would get link errors. Seems that we need to add a GLib/GIO dependency for that, so I went with a different approach.
Even wxBase links with glib under Linux, so I'm not sure what the problem was... In any case, if we made this a GUI function (which might make sense?), there definitely should be no problems with using glib function in wxGTK.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 50c743b Use g_file_trash for GTK, make error message more friendly
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> @@ -641,6 +641,160 @@ bool wxRemoveFile(const wxString& file)
return res == 0;
}
+#if defined(__WXMAC__)
+extern bool wxMoveToTrashOSX(const wxString& path);
+#endif
+
+#if defined(__UNIX__) && !defined(__WXMAC__)
+#include <fcntl.h>
+
+// Percent-encode a file path per RFC 2396 for the FreeDesktop Trash spec.
+static wxString wxTrashUrlEncodePath(const wxString& path)
Removed this, using g_file_trash now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
> + wxString encodedPath = wxTrashUrlEncodePath(fullPath);
+ wxString info = wxString::Format(
+ "[Trash Info]\nPath=%s\nDeletionDate=%s\n",
+ encodedPath,
+ wxDateTime::Now().FormatISOCombined()
+ );
+ infoFile.Write(info);
+ }
+
+ // Move the file or directory into Trash/files/
+ wxString destPath = trashFiles + "/" + trashName;
+ if ( wxRename(fullPath, destPath) != 0 )
+ {
+ // Move failed (e.g. cross-device) — clean up the .trashinfo
+ wxRemoveFile(infoPath);
+ wxLogSysError(_("'%s' couldn't be moved to trash"), path);
Removed this, using g_file_trash now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
In src/osx/cocoa/utils_base.mm:
> +bool wxMoveToTrashOSX(const wxString& path)
+{
+ wxCFStringRef cfPath(path);
+ NSURL *fileURL = [NSURL fileURLWithPath:cfPath.AsNSString()];
+ if ( fileURL == nil )
+ return false;
+
+ NSError *error = nil;
+ BOOL ok = [[NSFileManager defaultManager] trashItemAtURL:fileURL
+ resultingItemURL:nil
+ error:&error];
+ if ( !ok )
+ {
+ if ( error )
+ {
+ wxLogDebug("NSFileManager trashItemAtURL failed: %s",
Fixed.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> + if ( !wxFileName::Mkdir(trashFiles, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + if ( !wxFileName::Mkdir(trashInfo, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false;
Removed this, using g_file_trash now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)Using g_file_trash now. Seems simple enough now to keep MSW and GTK paths in one file, let me know if anyone disagrees.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
> + if ( !wxFileName::Mkdir(trashFiles, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + if ( !wxFileName::Mkdir(trashInfo, wxS_DIR_DEFAULT, wxPATH_MKDIR_FULL) ) + return false; + + // Resolve the full absolute path + wxFileName fileName(path); + fileName.MakeAbsolute(); + wxString fullPath = fileName.GetFullPath(); + + // Pick a unique trash name atomically using O_EXCL per the spec + wxString baseName = fileName.GetFullName(); + wxString trashName = baseName; + wxString infoPath; + + for ( int attempt = 2; ; ++attempt )
Removed this, using g_file_trash now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
> + // Write the .trashinfo file
+ {
+ wxFile infoFile;
+ if ( !infoFile.Open(infoPath, wxFile::write) )
+ {
+ wxRemoveFile(infoPath);
+ return false;
+ }
+
+ wxString encodedPath = wxTrashUrlEncodePath(fullPath);
+ wxString info = wxString::Format(
+ "[Trash Info]\nPath=%s\nDeletionDate=%s\n",
+ encodedPath,
+ wxDateTime::Now().FormatISOCombined()
+ );
+ infoFile.Write(info);
Removed this, using g_file_trash now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Miguel Gimenez
wh11204 left a comment (wxWidgets/wxWidgets#26256)I think these "unknown error" messages should be translatable
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
PB
@PBfordev commented on this pull request.
> @@ -348,6 +348,29 @@ bool wxConcatFiles(const wxString& src1, */ bool wxRemoveFile(const wxString& file); +/** + Moves @a path to the system trash or recycle bin, returning @true if + successful. + + This works for both files and directories. The item is not permanently + deleted and can be restored by the user from the platform's trash + facility. + + Under Windows, this uses the shell file operation with @c FOF_ALLOWUNDO. + Under macOS, this uses @c NSFileManager's @c trashItemAtURL method. + Under Unix systems (including Linux and BSD), this implements the
Just curious (I know nothing about Unix): Is the Unix part still still valid after changing the code?
I personally would also change the Windows part, replacing "the shell file operation" with the actual function name, i.e., SHFileOperation, as it is done for macOS.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 2714488 Make message translatable, update docs
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> @@ -348,6 +348,29 @@ bool wxConcatFiles(const wxString& src1, */ bool wxRemoveFile(const wxString& file); +/** + Moves @a path to the system trash or recycle bin, returning @true if + successful. + + This works for both files and directories. The item is not permanently + deleted and can be restored by the user from the platform's trash + facility. + + Under Windows, this uses the shell file operation with @c FOF_ALLOWUNDO. + Under macOS, this uses @c NSFileManager's @c trashItemAtURL method. + Under Unix systems (including Linux and BSD), this implements the
fixed
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)I think these "unknown error" messages should be translatable
Fixed.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz commented on this pull request.
Thanks, I definitely prefer the new version using the glib function. However I still think it would be better to implement this function in platform-specific file instead of the current approach.
I would advise doing the following:
- Add (and document in
docs/doxygen/mainpages/const_cpp.h)wxHAS_MOVE_TO_TRASHpreprocessor symbol. - Define it for the platforms really implementing this function in the header and implement it in the platform-specific files.
- Provide fallback function just returning false (maybe without logging anything, as I don't think this error message is really useful) in the common code
#ifndef wxHAS_MOVE_TO_TRASH.
And, of course, the CI failures need to be fixed (you should use .utf8_str()).
> +
+#elif defined(__WXMAC__)
+ return wxMoveToTrashOSX(path);
+
+#elif defined(__WXGTK__)
+ GError* err = nullptr;
+ GFile* file = g_file_new_for_path(path.fn_str());
+
+ bool ok = g_file_trash(file, nullptr, &err);
+ if ( !ok )
+ {
+ wxLogError(_("'%s' couldn't be moved to trash: %s"),
+ path, err ? err->message : _("unknown error"));
+ }
+
+ g_clear_error(&err);
We have wxGtkError in include/wx/gtk/private/error.h, please use it instead (see the examples of existing use in wxGTK).
> +#elif defined(__WXMAC__)
+ return wxMoveToTrashOSX(path);
+
+#elif defined(__WXGTK__)
+ GError* err = nullptr;
+ GFile* file = g_file_new_for_path(path.fn_str());
+
+ bool ok = g_file_trash(file, nullptr, &err);
+ if ( !ok )
+ {
+ wxLogError(_("'%s' couldn't be moved to trash: %s"),
+ path, err ? err->message : _("unknown error"));
+ }
+
+ g_clear_error(&err);
+ g_object_unref(file);
We also have wxGtkObject in include/wx/gtk/private/object.h to avoid having to do (or, worse, forget to do) this manually.
> + if ( !wxFileExists(path) && !wxDirExists(path) )
+ {
+ wxLogError(_("'%s' doesn't exist and can't be moved to trash."), path);
+ return false;
+ }
I wonder if this is actually needed, wouldn't we get a similar error from the native function anyhow in this case?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> + if ( !wxFileExists(path) && !wxDirExists(path) )
+ {
+ wxLogError(_("'%s' doesn't exist and can't be moved to trash."), path);
+ return false;
+ }
Indeed. I tend to be overly pedantic :) Removing this now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
> +#elif defined(__WXMAC__)
+ return wxMoveToTrashOSX(path);
+
+#elif defined(__WXGTK__)
+ GError* err = nullptr;
+ GFile* file = g_file_new_for_path(path.fn_str());
+
+ bool ok = g_file_trash(file, nullptr, &err);
+ if ( !ok )
+ {
+ wxLogError(_("'%s' couldn't be moved to trash: %s"),
+ path, err ? err->message : _("unknown error"));
+ }
+
+ g_clear_error(&err);
+ g_object_unref(file);
Making change now.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden commented on this pull request.
> +
+#elif defined(__WXMAC__)
+ return wxMoveToTrashOSX(path);
+
+#elif defined(__WXGTK__)
+ GError* err = nullptr;
+ GFile* file = g_file_new_for_path(path.fn_str());
+
+ bool ok = g_file_trash(file, nullptr, &err);
+ if ( !ok )
+ {
+ wxLogError(_("'%s' couldn't be moved to trash: %s"),
+ path, err ? err->message : _("unknown error"));
+ }
+
+ g_clear_error(&err);
Fixing now...
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- a1e2bfe Move into platform specific files, use GTK helper object, remove extra error message
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 98f9421 Fix docs
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 0d5dfa8 Fix link error with GTK on macOS
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)@vadz All requested changes applied.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
PB
PBfordev left a comment (wxWidgets/wxWidgets#26256)The error reporting on MSW still uses wxLogDebug() instead of wxLogError() the other two ports use?
"unknown error" in the macOS code path is not localized?
As for the docs:
- Does the Unix note still apply after changing the API (and the rest of the Unix docs)?
- I don't think I saw something like "Requires @c wxHAS_MOVE_TO_TRASH." for another API, this seems to be an implementation detail. The function is supported on all three platforms (Qt is not usually mentioned in the docs); I would not mention the availability at all here.
Sorry for all the nagging.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 5338fb8 Make message translatable
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 9886e8b Use wxLogError
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- a190088 Remove wxHAS_MOVE_TO_TRASH requirement note
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 53c1590 Remove stale comment about trash on external drives
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)Thanks, @PBfordev, I've applied the updates.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
PB
PBfordev left a comment (wxWidgets/wxWidgets#26256)Thanks, @PBfordev, I've applied the updates.
I would use the same error reporting on MSW as for the other two, i.e., (1) Make the message translatable and (2) Use the same basic message as in the other two ports (IMO, the current one is overly technical for the end user).
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
@Blake-Madden pushed 1 commit.
- 1875ad1 Improve MSW error message
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
Blake-Madden
Blake-Madden left a comment (wxWidgets/wxWidgets#26256)I would use the same error reporting on MSW as for the other two, i.e., (1) Make the message translatable and (2) Use the same basic message as in the other two ports (IMO, the current one is overly technical for the end user).
Done
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
@vadz approved this pull request.
Looks perfect now, thanks! Will merge soon.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.