diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-19 17:01:50 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-19 17:01:50 +0000 |
| commit | 638ccde5cf7428b75d0de5c0254ce07261085fee (patch) | |
| tree | 830e697eb0904c50abe41ba66c4b57ff5e903196 /src | |
| parent | 394540126b181982d8b61d07a084ceeac8559ed1 (diff) | |
button control moved to wParam everywhere
git-svn-id: http://svn.miranda-ng.org/main/trunk@483 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/button/button.cpp | 6 | ||||
| -rw-r--r-- | src/modules/skin/skinicons.cpp | 2 | ||||
| -rw-r--r-- | src/modules/skin/sounds.cpp | 3 | ||||
| -rw-r--r-- | src/modules/srfile/filexferdlg.cpp | 6 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/modules/button/button.cpp b/src/modules/button/button.cpp index ac1b301c4a..32ade1cd7a 100644 --- a/src/modules/button/button.cpp +++ b/src/modules/button/button.cpp @@ -447,17 +447,17 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L break;
case BUTTONSETDEFAULT:
- bct->defbutton = wParam?1:0;
+ bct->defbutton = (wParam != 0);
InvalidateRect(bct->hwnd, NULL, TRUE);
break;
case BUTTONSETASPUSHBTN:
- bct->pushBtn = 1;
+ bct->pushBtn = (wParam != 0);
InvalidateRect(bct->hwnd, NULL, TRUE);
break;
case BUTTONSETASFLATBTN:
- bct->flatBtn = 1;
+ bct->flatBtn = (wParam != 0);
InvalidateRect(bct->hwnd, NULL, TRUE);
break;
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp index 787d22eca9..777cc19757 100644 --- a/src/modules/skin/skinicons.cpp +++ b/src/modules/skin/skinicons.cpp @@ -203,7 +203,7 @@ void Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* too {
HWND hWnd = GetDlgItem(hwndDlg, itemId);
SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinIcon(iconId));
- SendMessage(hWnd, BUTTONSETASFLATBTN, 0, 0);
+ SendMessage(hWnd, BUTTONSETASFLATBTN, TRUE, 0);
SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0);
}
diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 4bd66ff50b..88c75b6d14 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -22,7 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "..\..\core\commonheaders.h"
-struct SoundItem {
+struct SoundItem
+{
char* name;
TCHAR* section;
TCHAR* description;
diff --git a/src/modules/srfile/filexferdlg.cpp b/src/modules/srfile/filexferdlg.cpp index 7864eb5a96..743e220051 100644 --- a/src/modules/srfile/filexferdlg.cpp +++ b/src/modules/srfile/filexferdlg.cpp @@ -284,14 +284,14 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR SendDlgItemMessage(hwndDlg, IDC_CONTACT, BM_SETIMAGE, IMAGE_ICON,
(LPARAM)LoadSkinnedProtoIcon((char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0), ID_STATUS_ONLINE));
SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Contact menu"), 0);
- SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONSETASFLATBTN, 0, 0);
+ SendDlgItemMessage(hwndDlg, IDC_CONTACT, BUTTONSETASFLATBTN, TRUE, 0);
Button_SetIcon_IcoLib(hwndDlg, IDC_OPENFILE, SKINICON_OTHER_DOWNARROW, LPGEN("Open..."));
- SendDlgItemMessage(hwndDlg, IDC_OPENFILE, BUTTONSETASPUSHBTN, 0, 0);
+ SendDlgItemMessage(hwndDlg, IDC_OPENFILE, BUTTONSETASPUSHBTN, TRUE, 0);
SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BM_SETIMAGE, IMAGE_ICON, (LPARAM)dat->hIconFolder);
SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BUTTONADDTOOLTIP, (WPARAM)LPGEN("Open folder"), 0);
- SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BUTTONSETASFLATBTN, 0, 0);
+ SendDlgItemMessage(hwndDlg, IDC_OPENFOLDER, BUTTONSETASFLATBTN, TRUE, 0);
Button_SetIcon_IcoLib(hwndDlg, IDCANCEL, SKINICON_OTHER_DELETE, LPGEN("Cancel"));
|