From 6d22869470306be0c2fec2a6d344f6aaafc4b0af Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 8 Jul 2012 14:35:33 +0000 Subject: fix for reading avatars git-svn-id: http://svn.miranda-ng.org/main/trunk@849 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TopToolBar/toolbar.cpp | 4 ++-- plugins/TopToolBar/topbutton.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/toolbar.cpp index 70019d75b9..44d2e537b5 100644 --- a/plugins/TopToolBar/toolbar.cpp +++ b/plugins/TopToolBar/toolbar.cpp @@ -101,7 +101,7 @@ void LoadAllLButs() { //must be locked int cnt = DBGetContactSettingByte(0, TTB_OPTDIR, "LaunchCnt", 0); - for (int i = 1; i<=cnt; i++) + for (int i = 0; i < cnt; i++) InsertLBut(i); } @@ -120,7 +120,7 @@ void LoadAllSeparators() { //must be locked int cnt = DBGetContactSettingByte(0, TTB_OPTDIR, "SepCnt", 0); - for (int i = 1; i<=cnt; i++) + for (int i = 0; i < cnt; i++) InsertSeparator(i); } diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/topbutton.cpp index 952140da95..651686feea 100644 --- a/plugins/TopToolBar/topbutton.cpp +++ b/plugins/TopToolBar/topbutton.cpp @@ -28,21 +28,21 @@ DWORD TopButtonInt::CheckFlags(DWORD Flags) EnableWindow(hwnd,(dwFlags & TTBBF_DISABLED)?FALSE:TRUE); } if (BitChanged(TTBBF_ASPUSHBUTTON)) { - dwFlags^=TTBBF_ASPUSHBUTTON; + dwFlags ^= TTBBF_ASPUSHBUTTON; SendMessage(hwnd, BUTTONSETASPUSHBTN, (dwFlags & TTBBF_ASPUSHBUTTON)?1:0, 0); } if (BitChanged(TTBBF_SHOWTOOLTIP)) { - dwFlags^=TTBBF_SHOWTOOLTIP; + dwFlags ^= TTBBF_SHOWTOOLTIP; SendMessage(hwnd,BUTTONADDTOOLTIP, (WPARAM)((dwFlags & TTBBF_SHOWTOOLTIP)?tooltip:L""),BATF_UNICODE); } // next settings changing visual side, requires additional actions if (BitChanged(TTBBF_VISIBLE)) { - dwFlags^=TTBBF_VISIBLE; + dwFlags ^= TTBBF_VISIBLE; res |= TTBBF_VISIBLE; } if (BitChanged(TTBBF_PUSHED)) { - dwFlags^=TTBBF_PUSHED; + dwFlags ^= TTBBF_PUSHED; res |= TTBBF_PUSHED; bPushed = (dwFlags & TTBBF_PUSHED) ? TRUE : FALSE; } -- cgit v1.2.3