diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:50:45 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:50:45 +0200 |
| commit | eca5f1c8831fd0776e57a174362b0515104174c2 (patch) | |
| tree | 5cba4e6c74d1f5c78018eff1b09b1973c5b7604f /library/CustomGrid.cpp | |
| parent | 1.6 (diff) | |
| download | FreeFileSync-eca5f1c8831fd0776e57a174362b0515104174c2.tar.gz FreeFileSync-eca5f1c8831fd0776e57a174362b0515104174c2.tar.bz2 FreeFileSync-eca5f1c8831fd0776e57a174362b0515104174c2.zip | |
1.7
Diffstat (limited to 'library/CustomGrid.cpp')
| -rw-r--r-- | library/CustomGrid.cpp | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/library/CustomGrid.cpp b/library/CustomGrid.cpp index 053244f5..93f2107a 100644 --- a/library/CustomGrid.cpp +++ b/library/CustomGrid.cpp @@ -53,29 +53,29 @@ public: if (selectedForSynchronization) switch (result) { - case fileOnLeftSideOnly: - return "<|"; + case FILE_LEFT_SIDE_ONLY: + return wxT("<|"); break; - case fileOnRightSideOnly: - return "|>"; + case FILE_RIGHT_SIDE_ONLY: + return wxT("|>"); break; - case rightFileNewer: - return ">>"; + case FILE_RIGHT_NEWER: + return wxT(">>"); break; - case leftFileNewer: - return "<<"; + case FILE_LEFT_NEWER: + return wxT("<<"); break; - case filesDifferent: - return "!="; + case FILE_DIFFERENT: + return wxT("!="); break; - case filesEqual: - return "=="; + case FILE_EQUAL: + return wxT("=="); break; default: assert (false); return wxEmptyString; } - else return "(-)"; + else return wxT("(-)"); } @@ -93,7 +93,7 @@ public: case 1: if (col < 4) { - if (gridLine.fileDescrLeft.objType == isDirectory) + if (gridLine.fileDescrLeft.objType == TYPE_DIRECTORY) { switch (col) { @@ -107,7 +107,7 @@ public: return gridLine.fileDescrLeft.lastWriteTime; } } - else if (gridLine.fileDescrLeft.objType == isFile) + else if (gridLine.fileDescrLeft.objType == TYPE_FILE) { switch (col) { @@ -127,7 +127,7 @@ public: case 2: if (col < 4) { - if (gridLine.fileDescrRight.objType == isDirectory) + if (gridLine.fileDescrRight.objType == TYPE_DIRECTORY) { switch (col) { @@ -141,7 +141,7 @@ public: return gridLine.fileDescrRight.lastWriteTime; } } - else if (gridLine.fileDescrRight.objType == isFile) + else if (gridLine.fileDescrRight.objType == TYPE_FILE) { switch (col) { @@ -426,8 +426,7 @@ void CustomGrid::setScrollFriends(CustomGrid* grid1, CustomGrid* grid2, CustomGr void CustomGrid::setGridDataTable(GridView* gridRefUI, FileCompareResult* gridData) -{ - //set underlying grid data +{ //set underlying grid data assert(gridDataTable); gridDataTable->setGridDataTable(gridRefUI, gridData); } |