From fe0465b11a317db5408d897484caedc3a5f10c47 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sun, 14 Dec 2014 03:42:51 +0000 Subject: SendDlgItemMessage(...BM_SETCHECK ...) -> CheckDlgButton(...) SendDlgItemMessage(...BM_GETCHECK ...) -> IsDlgButtonChecked(...) constants fix for CheckDlgButton() git-svn-id: http://svn.miranda-ng.org/main/trunk@11387 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NotesAndReminders/src/options.cpp | 24 ++++++++++++------------ plugins/NotesAndReminders/src/reminders.cpp | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'plugins/NotesAndReminders/src') diff --git a/plugins/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp index d9a3c9798e..0fd7503e6c 100644 --- a/plugins/NotesAndReminders/src/options.cpp +++ b/plugins/NotesAndReminders/src/options.cpp @@ -349,12 +349,12 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_SETRANGE,TRUE,MAKELONG(0,255-MIN_ALPHA)); SendDlgItemMessage(hdlg,IDC_SLIDER_TRANSPARENCY,TBM_SETPOS,TRUE,255-g_Transparency); - CheckDlgButton(hdlg,IDC_CHECK_HIDENOTES,!g_ShowNotesAtStart); - CheckDlgButton(hdlg,IDC_CHECK_MENUS,g_AddContListMI); - CheckDlgButton(hdlg,IDC_CHECK_BUTTONS,g_ShowNoteButtons); - CheckDlgButton(hdlg,IDC_CHECK_SCROLLBARS,g_ShowScrollbar); - CheckDlgButton(hdlg,IDC_CHECK_CLOSE,g_CloseAfterAddReminder); - CheckDlgButton(hdlg,IDC_CHECK_MSI,!g_UseDefaultPlaySound); + CheckDlgButton(hdlg, IDC_CHECK_HIDENOTES, !g_ShowNotesAtStart ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_MENUS, g_AddContListMI ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_BUTTONS, g_ShowNoteButtons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_SCROLLBARS, g_ShowScrollbar ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_CLOSE, g_CloseAfterAddReminder ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_MSI, !g_UseDefaultPlaySound ? BST_CHECKED : BST_UNCHECKED); SetDlgItemInt(hdlg,IDC_EDIT_WIDTH,g_NoteWidth,FALSE); SetDlgItemInt(hdlg,IDC_EDIT_HEIGHT,g_NoteHeight,FALSE); @@ -503,12 +503,12 @@ INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPar g_NoteTitleTime = 1; g_CloseAfterAddReminder = TRUE; g_UseDefaultPlaySound = FALSE; - CheckDlgButton(hdlg,IDC_CHECK_HIDENOTES,!g_ShowNotesAtStart); - CheckDlgButton(hdlg,IDC_CHECK_MENUS,g_AddContListMI); - CheckDlgButton(hdlg,IDC_CHECK_SCROLLBARS,g_ShowScrollbar); - CheckDlgButton(hdlg,IDC_CHECK_BUTTONS,g_ShowNoteButtons); - CheckDlgButton(hdlg,IDC_CHECK_CLOSE,g_CloseAfterAddReminder); - CheckDlgButton(hdlg,IDC_CHECK_MSI,!g_UseDefaultPlaySound); + CheckDlgButton(hdlg, IDC_CHECK_HIDENOTES, !g_ShowNotesAtStart ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_MENUS, g_AddContListMI ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_SCROLLBARS, g_ShowScrollbar ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_BUTTONS, g_ShowNoteButtons ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_CLOSE, g_CloseAfterAddReminder ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hdlg, IDC_CHECK_MSI, !g_UseDefaultPlaySound ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hdlg,IDC_COMBODATE,CB_SETCURSEL,(WPARAM)(g_NoteTitleDate-1),0); SendDlgItemMessage(hdlg,IDC_COMBOTIME,CB_SETCURSEL,(WPARAM)(g_NoteTitleTime-1),0); g_NoteWidth = 179; diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index d7428069e7..49d767ab1a 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -1583,8 +1583,8 @@ INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LP ShowWindow(GetDlgItem(Dialog,IDC_TIMEAGAIN),SW_HIDE); ShowWindow(GetDlgItem(Dialog,IDC_STATIC_DATE),SW_HIDE); ShowWindow(GetDlgItem(Dialog,IDC_STATIC_TIME),SW_HIDE); - SendDlgItemMessage(Dialog,IDC_AFTER,BM_SETCHECK,1,0); - SendDlgItemMessage(Dialog,IDC_ONDATE,BM_SETCHECK,0,0); + CheckDlgButton(Dialog, IDC_AFTER, BST_CHECKED); + CheckDlgButton(Dialog, IDC_ONDATE, BST_UNCHECKED); SendDlgItemMessage(Dialog,IDC_REMINDAGAININ,CB_SETCURSEL,0,0); SendDlgItemMessage(Dialog, IDC_REMDATA, EM_LIMITTEXT, MAX_REMINDER_LEN, 0); @@ -1919,10 +1919,10 @@ INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARA SetDlgItemText(Dialog, IDC_REFTIME, s); } - /*SendDlgItemMessage(Dialog,IDC_NONE,BM_SETCHECK,1,0); - SendDlgItemMessage(Dialog,IDC_DAILY,BM_SETCHECK,0,0); - SendDlgItemMessage(Dialog,IDC_WEEKLY,BM_SETCHECK,0,0); - SendDlgItemMessage(Dialog,IDC_MONTHLY,BM_SETCHECK,0,0);*/ + /*CheckDlgButton(Dialog, IDC_NONE, BST_CHECKED); + CheckDlgButton(Dialog, IDC_DAILY, BST_UNCHECKED); + CheckDlgButton(Dialog, IDC_WEEKLY, BST_UNCHECKED); + CheckDlgButton(Dialog, IDC_MONTHLY, BST_UNCHECKED);*/ PopulateTimeCombo(Dialog, IDC_TIME, NewReminderVisible != 2, &tm); -- cgit v1.2.3