summaryrefslogtreecommitdiff
path: root/shared/taskbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'shared/taskbar.cpp')
-rw-r--r--shared/taskbar.cpp13
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)
{
bgstack15