diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-05 23:17:49 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-05 23:17:49 +0300 |
| commit | e5e268f1267ac0a16303081f1532fa1597911887 (patch) | |
| tree | 1cd593db774c2a83e917e2450f6f33d289e4d9dd /plugins/TopToolBar/src | |
| parent | 0b76f598f879aba590c11496d4266ae02d087bde (diff) | |
fixes #1448 (translated frame names in database)
Diffstat (limited to 'plugins/TopToolBar/src')
| -rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp | 4 | ||||
| -rw-r--r-- | plugins/TopToolBar/src/toolbarwnd.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 195d0e5f05..ae798838c2 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -593,8 +593,8 @@ static int OnShutdown(WPARAM, LPARAM) {
if (g_ctrl) {
if (g_ctrl->hFrame) {
- CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)g_ctrl->hFrame, 0);
- g_ctrl->hFrame = nullptr;
+ CallService(MS_CLIST_FRAMES_REMOVEFRAME, g_ctrl->hFrame, 0);
+ g_ctrl->hFrame = 0;
}
if (g_ctrl->hWnd) {
DestroyWindow(g_ctrl->hWnd);
diff --git a/plugins/TopToolBar/src/toolbarwnd.cpp b/plugins/TopToolBar/src/toolbarwnd.cpp index 5099ddad7f..3eb9e78cde 100644 --- a/plugins/TopToolBar/src/toolbarwnd.cpp +++ b/plugins/TopToolBar/src/toolbarwnd.cpp @@ -270,15 +270,15 @@ void CALLBACK OnEventFire() InitInternalButtons(); // if there's no customized frames, create our own - if (g_ctrl->hFrame == nullptr) { + if (g_ctrl->hFrame == 0) { CLISTFrame Frame = { sizeof(Frame) }; - Frame.tname = L"Toolbar"; + Frame.szName.a = "Toolbar"; Frame.hWnd = g_ctrl->hWnd; Frame.align = alTop; - Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED | F_UNICODE; + Frame.Flags = F_VISIBLE | F_NOBORDER | F_LOCKED; Frame.height = g_ctrl->nLastHeight; Frame.hIcon = Skin_LoadIcon(SKINICON_OTHER_FRAME); - g_ctrl->hFrame = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0); + g_ctrl->hFrame = g_plugin.addFrame(&Frame); } // receive buttons |