summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:17:08 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:17:08 +0200
commitcc9a53cd3874c35e9caf47b44224abc159526891 (patch)
treeb13b5c0ddb471a109ac648d469f72dcc6f9c6e07 /lib
parent4.3 (diff)
downloadFreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.tar.gz
FreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.tar.bz2
FreeFileSync-cc9a53cd3874c35e9caf47b44224abc159526891.zip
4.4
Diffstat (limited to 'lib')
-rw-r--r--lib/custom_grid.cpp6
-rw-r--r--lib/parse_plural.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/custom_grid.cpp b/lib/custom_grid.cpp
index f2892624..736bc49d 100644
--- a/lib/custom_grid.cpp
+++ b/lib/custom_grid.cpp
@@ -2298,13 +2298,13 @@ void GridCellRendererMiddle::Draw(wxGrid& grid,
case CustomGridMiddle::BLOCKPOS_CHECK_BOX:
break;
case CustomGridMiddle::BLOCKPOS_LEFT:
- dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_LEFT)), rectShrinked, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
+ dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_LEFT, true)), rectShrinked, wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL);
break;
case CustomGridMiddle::BLOCKPOS_MIDDLE:
- dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_NONE)), rectShrinked, wxALIGN_CENTER | wxALIGN_CENTER_VERTICAL);
+ dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_NONE, true)), rectShrinked, wxALIGN_CENTER | wxALIGN_CENTER_VERTICAL);
break;
case CustomGridMiddle::BLOCKPOS_RIGHT:
- dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_RIGHT)), rectShrinked, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
+ dc.DrawLabel(wxEmptyString, getSyncOpImage(fsObj->testSyncOperation(SYNC_DIR_RIGHT, true)), rectShrinked, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
break;
}
else //default
diff --git a/lib/parse_plural.h b/lib/parse_plural.h
index 960172fa..4ac9e47b 100644
--- a/lib/parse_plural.h
+++ b/lib/parse_plural.h
@@ -229,7 +229,7 @@ private:
{
public:
Parser(const Wstring& phrase, //in
- const Expr<int>*& expr, int& n, PluralForm::DumpList& dump) ://out
+ const Expr<int>*& expr, int& n, PluralForm::DumpList& dump) : //out
scn(phrase),
tk(scn.nextToken()),
n_(n),
bgstack15