diff --git a/Library/MeasurePlugin.h b/Library/MeasurePlugin.h index 82dfa60b..efc79dd3 100644 --- a/Library/MeasurePlugin.h +++ b/Library/MeasurePlugin.h @@ -34,7 +34,7 @@ typedef void (*NEWRELOAD)(void*, void*, double*); typedef void (*NEWFINALIZE)(void*); typedef double (*NEWUPDATE)(void*); typedef LPCWSTR (*NEWGETSTRING)(void*); -typedef void (*NEWEXECUTEBANG)(void*, const LPCWSTR); +typedef void (*NEWEXECUTEBANG)(void*, LPCWSTR); class CMeasurePlugin : public CMeasure { diff --git a/Library/Rainmeter.h b/Library/Rainmeter.h index 04c520b1..87ada146 100644 --- a/Library/Rainmeter.h +++ b/Library/Rainmeter.h @@ -198,7 +198,6 @@ public: const std::wstring& GetTrayExecuteDL() { return m_TrayExecuteDL; } const std::wstring& GetTrayExecuteDM() { return m_TrayExecuteDM; } - void ExecuteBang(const std::wstring& name, std::wstring& arg, CMeterWindow* meterWindow); void ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow); void RefreshAll(); @@ -226,6 +225,8 @@ private: void Bang_TrayMenu(); void Bang_WriteKeyValue(const WCHAR* arg, CMeterWindow* meterWindow); + void ExecuteBang(const std::wstring& name, std::wstring& arg, CMeterWindow* meterWindow); + void ActivateActiveConfigs(); void CreateMeterWindow(const std::wstring& config, const std::wstring& iniFile); bool DeleteMeterWindow(CMeterWindow* meterWindow, bool bLater);