summaryrefslogtreecommitdiff
path: root/library/CustomGrid.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:05:53 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:05:53 +0200
commit618dfb51d93898632830f1b87443d3f748780871 (patch)
treebac520a2e261154f8d35b0cb8aa345f5ab373811 /library/CustomGrid.cpp
parent3.4 (diff)
downloadFreeFileSync-618dfb51d93898632830f1b87443d3f748780871.tar.gz
FreeFileSync-618dfb51d93898632830f1b87443d3f748780871.tar.bz2
FreeFileSync-618dfb51d93898632830f1b87443d3f748780871.zip
3.5
Diffstat (limited to 'library/CustomGrid.cpp')
-rw-r--r--library/CustomGrid.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/library/CustomGrid.cpp b/library/CustomGrid.cpp
index a04548a3..e9fe9eb6 100644
--- a/library/CustomGrid.cpp
+++ b/library/CustomGrid.cpp
@@ -8,7 +8,7 @@
#include "../shared/systemConstants.h"
#include "resources.h"
#include <wx/dc.h>
-#include "../ui/util.h"
+#include "../shared/util.h"
#include "../shared/stringConv.h"
#include "resources.h"
#include <typeinfo>
@@ -296,7 +296,7 @@ protected:
case xmlAccess::DIRECTORY:
return zToWx(fileObj->getBaseDirPf<side>());
case xmlAccess::SIZE: //file size
- return FreeFileSync::includeNumberSeparator(fileObj->getFileSize<side>().ToString());
+ return FreeFileSync::numberToWxString(fileObj->getFileSize<side>(), true);
case xmlAccess::DATE: //date
return FreeFileSync::utcTimeToLocalString(fileObj->getLastWriteTime<side>(), fileObj->getFullName<side>());
case xmlAccess::EXTENSION: //file extension
@@ -896,14 +896,14 @@ void CustomGrid::DrawColLabel(wxDC& dc, int col)
}
-std::set<unsigned int> CustomGrid::getAllSelectedRows() const
+std::set<size_t> CustomGrid::getAllSelectedRows() const
{
- std::set<unsigned int> output;
+ std::set<size_t> output;
const wxArrayInt selectedRows = this->GetSelectedRows();
if (!selectedRows.IsEmpty())
{
- for (unsigned int i = 0; i < selectedRows.GetCount(); ++i)
+ for (size_t i = 0; i < selectedRows.GetCount(); ++i)
output.insert(selectedRows[i]);
}
bgstack15