From b4523bc74a6afcc0428034f8b2726e1b2e226475 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 21 Sep 2012 14:08:42 +0000 Subject: - fix for the Netlib_Logf event - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@1623 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/skin/hotkey_opts.cpp | 12 ++++++------ src/modules/skin/sounds.cpp | 34 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src/modules/skin') diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp index f23e777604..fb932ed7b7 100644 --- a/src/modules/skin/hotkey_opts.cpp +++ b/src/modules/skin/hotkey_opts.cpp @@ -407,11 +407,11 @@ static void sttOptionsStartEdit(HWND hwndDlg, HWND hwndHotkey) SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_SETHOTKEY, MAKELONG(LOBYTE(item->OptHotkey), HIBYTE(item->OptHotkey)), 0); SetWindowPos(hwndHotkey, HWND_BOTTOM, 0, 0, 0, 0, SWP_SHOWWINDOW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE); - SetWindowPos(GetDlgItem(hwndDlg, IDC_HOTKEY), HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, SWP_SHOWWINDOW); - RedrawWindow(GetDlgItem(hwndDlg, IDC_HOTKEY), NULL, NULL, RDW_INVALIDATE); + SetWindowPos( GetDlgItem(hwndDlg, IDC_HOTKEY), HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, SWP_SHOWWINDOW); + RedrawWindow( GetDlgItem(hwndDlg, IDC_HOTKEY), NULL, NULL, RDW_INVALIDATE); - SetFocus(GetDlgItem(hwndDlg, IDC_HOTKEY)); - RedrawWindow(GetDlgItem(hwndDlg, IDC_HOTKEY), NULL, NULL, RDW_INVALIDATE); + SetFocus( GetDlgItem(hwndDlg, IDC_HOTKEY)); + RedrawWindow( GetDlgItem(hwndDlg, IDC_HOTKEY), NULL, NULL, RDW_INVALIDATE); } } @@ -437,7 +437,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, TranslateDialogDefault(hwndDlg); - HotkeyEditCreate(GetDlgItem(hwndDlg, IDC_HOTKEY)); + HotkeyEditCreate( GetDlgItem(hwndDlg, IDC_HOTKEY)); { HIMAGELIST hIml = ImageList_Create(16, 16, ILC_MASK + (IsWinVerXPPlus() ? ILC_COLOR32 : ILC_COLOR16), 3, 1); ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_WINDOWS); @@ -612,7 +612,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, THotkeyItem *item; WORD wHotkey = (WORD)SendDlgItemMessage(hwndDlg, IDC_HOTKEY, HKM_GETHOTKEY, 0, 0); - ShowWindow(GetDlgItem(hwndDlg, IDC_HOTKEY), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_HOTKEY), SW_HIDE); SetFocus(hwndHotkey); if ( !wHotkey || (wHotkey == VK_ESCAPE) || (HIWORD(wParam) != 0)) break; diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 59326aaa97..e9aa29ed9c 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -199,29 +199,29 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break; case DM_HIDEPANE: - ShowWindow(GetDlgItem(hwndDlg, IDC_SGROUP), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_NAME), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_NAMEVAL), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_SLOC), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_LOCATION), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_CHANGE), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_PREVIEW), SW_HIDE); - ShowWindow(GetDlgItem(hwndDlg, IDC_GETMORE), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_SGROUP), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_NAME), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_NAMEVAL), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_SLOC), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_LOCATION), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_CHANGE), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_PREVIEW), SW_HIDE); + ShowWindow( GetDlgItem(hwndDlg, IDC_GETMORE), SW_HIDE); break; case DM_SHOWPANE: - ShowWindow(GetDlgItem(hwndDlg, IDC_SGROUP), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_NAME), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_NAMEVAL), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_SLOC), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_LOCATION), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_CHANGE), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_PREVIEW), SW_SHOW); - ShowWindow(GetDlgItem(hwndDlg, IDC_GETMORE), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_SGROUP), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_NAME), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_NAMEVAL), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_SLOC), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_LOCATION), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_CHANGE), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_PREVIEW), SW_SHOW); + ShowWindow( GetDlgItem(hwndDlg, IDC_GETMORE), SW_SHOW); break; case DM_CHECKENABLED: - EnableWindow(GetDlgItem(hwndDlg, IDC_SOUNDTREE), IsDlgButtonChecked(hwndDlg, IDC_ENABLESOUNDS)); + EnableWindow( GetDlgItem(hwndDlg, IDC_SOUNDTREE), IsDlgButtonChecked(hwndDlg, IDC_ENABLESOUNDS)); if ( !IsDlgButtonChecked(hwndDlg, IDC_ENABLESOUNDS)) SendMessage(hwndDlg, DM_HIDEPANE, 0, 0); else if (TreeView_GetSelection(hwndTree) && TreeView_GetParent(hwndTree, TreeView_GetSelection(hwndTree))) -- cgit v1.2.3