diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:12:46 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:12:46 +0200 |
| commit | b338e29fd3eaf700f8c8360aa0310048ba941d54 (patch) | |
| tree | 122f8ef3790d12cd10275ef7453a9e8053322d78 /shared/taskbar.cpp | |
| parent | 3.18 (diff) | |
| download | FreeFileSync-b338e29fd3eaf700f8c8360aa0310048ba941d54.tar.gz FreeFileSync-b338e29fd3eaf700f8c8360aa0310048ba941d54.tar.bz2 FreeFileSync-b338e29fd3eaf700f8c8360aa0310048ba941d54.zip | |
3.19
Diffstat (limited to 'shared/taskbar.cpp')
| -rw-r--r-- | shared/taskbar.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/shared/taskbar.cpp b/shared/taskbar.cpp index 5767f8c9..969f4bb0 100644 --- a/shared/taskbar.cpp +++ b/shared/taskbar.cpp @@ -33,16 +33,13 @@ bool windows7TaskbarAvailable() } -const std::wstring& getTaskBarDllName() +std::wstring getTaskBarDllName() { assert_static(util::is32BitBuild || util::is64BitBuild); - static const std::wstring filename( - util::is64BitBuild ? - L"Taskbar7_x64.dll" : - L"Taskbar7_Win32.dll"); - - return filename; + return util::is64BitBuild ? + L"Taskbar7_x64.dll" : + L"Taskbar7_Win32.dll"; } } //######################################################################################################## @@ -108,7 +105,7 @@ private: TaskbarProgress::TaskbarProgress(const wxTopLevelWindow& window) : pimpl_(new Pimpl(window)) {} -TaskbarProgress::~TaskbarProgress() {} //std::auto_ptr ... +TaskbarProgress::~TaskbarProgress() {} //std::unique_ptr ... void TaskbarProgress::setStatus(Status status) { |