summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-01-07 15:16:36 +0000
committerCarl Hetherington <cth@carlh.net>2016-01-07 15:16:36 +0000
commitf9482e2896031942784f870306e705d070ceac9d (patch)
tree2cf0bcc0a786705985100c0ddac38162adb57768 /src
parent9ec580d9c12d6e68a44c5b81cca5d7342f7453ff (diff)
Sort image files added using "Add file(s)..." alphabetically,
as I think this is less surprising than trying to do it by number. Numerically-named files are much more likely to be added using "Add folder.."
Diffstat (limited to 'src')
-rw-r--r--src/wx/content_panel.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 59886229c..6d4a11868 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -40,8 +40,6 @@
#include <boost/foreach.hpp>
#include <iostream>
-#include "lib/image_filename_sorter.cc"
-
using std::list;
using std::string;
using std::cout;
@@ -518,10 +516,11 @@ void
ContentPanel::add_files (list<boost::filesystem::path> paths)
{
/* It has been reported that the paths returned from e.g. wxFileDialog are not always sorted;
- I can't reproduce that, but sort them anyway.
+ I can't reproduce that, but sort them anyway. Don't use ImageFilenameSorter as a normal
+ alphabetical sort is expected here.
*/
- paths.sort (ImageFilenameSorter ());
+ paths.sort ();
/* XXX: check for lots of files here and do something */