diff options
| -rw-r--r-- | plugins/Clist_nicer/SRC/clui.cpp | 2 | ||||
| -rw-r--r-- | src/modules/button/button.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugins/Clist_nicer/SRC/clui.cpp b/plugins/Clist_nicer/SRC/clui.cpp index cb10395038..106ade9372 100644 --- a/plugins/Clist_nicer/SRC/clui.cpp +++ b/plugins/Clist_nicer/SRC/clui.cpp @@ -408,12 +408,14 @@ static int IcoLibChanged(WPARAM wParam, LPARAM lParam) void CreateButtonBar(HWND hWnd)
{
hTbMenu = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU) IDC_TBMENU, g_hInst, NULL);
+ CustomizeButton(hTbMenu, false, false, false);
SetWindowText(hTbMenu, TranslateT("Menu"));
SendMessage(hTbMenu, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadSkinnedIcon(SKINICON_OTHER_MIRANDA));
SendMessage(hTbMenu, BUTTONSETASMENUACTION, 1, 0);
SendMessage(hTbMenu, BUTTONADDTOOLTIP, (WPARAM) TranslateTS(LPGENT("Open main menu")), BATF_UNICODE);
hTbGlobalStatus = CreateWindowEx(0, MIRANDABUTTONCLASS, _T(""), BS_PUSHBUTTON | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, hWnd, (HMENU) IDC_TBGLOBALSTATUS, g_hInst, NULL);
+ CustomizeButton(hTbGlobalStatus, false, false, false);
SetWindowText(hTbGlobalStatus, TranslateT("Offline"));
SendMessage(hTbGlobalStatus, BM_SETIMAGE, IMAGE_ICON, (LPARAM) LoadSkinnedIcon(SKINICON_STATUS_OFFLINE));
SendMessage(hTbGlobalStatus, BUTTONSETASMENUACTION, 1, 0);
diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp index c55c4f807f..6793391fe6 100644 --- a/src/modules/button/button.cpp +++ b/src/modules/button/button.cpp @@ -507,7 +507,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L case BUTTONSETCUSTOM:
{
MButtonCustomize *pCustom = (MButtonCustomize*)lParam;
- if (pCustom == NULL)
+ if (pCustom == NULL || bct->fnWindowProc)
break;
bct = (MButtonCtrl*)mir_realloc(bct, pCustom->cbLen);
|