diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-16 20:33:13 +0000 |
| commit | 769b537b5e1a99fc53aa7296fd2b21dc77a4071c (patch) | |
| tree | 7df94b386078575e6186523e1a165e4b0ba7ad9f /plugins/MsgPopup/src | |
| parent | 2e15a3c2aae091fcbdd3234931a2777d050e43e1 (diff) | |
name conflicts solved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14971 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/MsgPopup/src')
| -rw-r--r-- | plugins/MsgPopup/src/options.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/MsgPopup/src/options.cpp b/plugins/MsgPopup/src/options.cpp index ab987af80d..7ef6719f42 100644 --- a/plugins/MsgPopup/src/options.cpp +++ b/plugins/MsgPopup/src/options.cpp @@ -38,6 +38,9 @@ static int __inline DBWriteContactSettingDwordDef(MCONTACT hContact, const char INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{
+ int value;
+ BOOL Translated;
+
switch (message) {
case WM_INITDIALOG:
TranslateDialogDefault(hWnd);
@@ -50,8 +53,6 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l return TRUE;
case WM_COMMAND:
- int indx, value;
- BOOL Translated;
if (LOWORD(wParam) == IDC_PREVIEW) {
MessageBox(0, TranslateT("Message with question"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONQUESTION);
MessageBox(0, TranslateT("Message with exclamation"), TranslateTS(_T(SERVICENAME) _T(" - demo")), MB_ICONEXCLAMATION);
@@ -64,7 +65,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l if (LOWORD(wParam) == IDC_MESSAGEBEEP)
options.Sound = IsDlgButtonChecked(hWnd, IDC_MESSAGEBEEP) == BST_CHECKED;
else {
- for (indx = 0; indx < 4; indx++) {
+ for (int indx = 0; indx < 4; indx++) {
if (LOWORD(wParam) == idOptionControls[indx][0]) {
if (HIWORD(wParam) != CPN_COLOURCHANGED) return FALSE;
options.FG[indx] = SendDlgItemMessage(hWnd, LOWORD(wParam), CPM_GETCOLOUR, 0, 0);
@@ -96,9 +97,8 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM l char szNameFG[4];
char szNameBG[4];
char szNameTO[4];
- int indx;
- for (indx = 0; indx < 4; indx++) {
+ for (int indx = 0; indx < 4; indx++) {
mir_snprintf(szNameFG, _countof(szNameFG), "FG%d", indx);
mir_snprintf(szNameBG, _countof(szNameBG), "BG%d", indx);
mir_snprintf(szNameTO, _countof(szNameTO), "TO%d", indx);
|