Compatibility fixes and small cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@791 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 87 insertions, 81 deletions

diff --git a/plugins/Console/Console.cpp b/plugins/Console/Console.cpp
index b0f0a97073..59756e996c 100644
--- a/plugins/Console/Console.cpp
+++ b/plugins/Console/Console.cpp
@@ -74,7 +74,7 @@ typedef struct {
 

 typedef struct {

 	HWND hwnd;

-	HANDLE hList;

+	HWND hList;

 	char *Module;

 	int Scroll;

 	int Paused;

@@ -167,7 +167,7 @@ static int OnTTBLoaded(WPARAM wParam,LPARAM lParam)
 

 void ScrollDown(LOGWIN * dat) {

 	if (dat->Scroll)

-		ListView_EnsureVisible(dat->hwnd, ListView_GetItemCount(dat->hwnd) - 1, FALSE);

+		ListView_EnsureVisible(dat->hList, ListView_GetItemCount(dat->hList) - 1, FALSE);

 }

 

 ////////////////////////////////////////////////////////////////////////////////

@@ -192,7 +192,7 @@ static void ShowConsole(int show)
 		SetForegroundWindow(hwnd);

 

 	if (show)

-		RedrawWindow(pActive->hwnd, NULL, NULL, RDW_INVALIDATE | RDW_FRAME |RDW_UPDATENOW | RDW_ERASE);

+		RedrawWindow(pActive->hList, NULL, NULL, RDW_INVALIDATE | RDW_FRAME |RDW_UPDATENOW | RDW_ERASE);

 

 	if (hMenu)

 	{

@@ -200,7 +200,7 @@ static void ShowConsole(int show)
 

 		mi.cbSize = sizeof(mi);

 		mi.ptszName=(show)?TranslateT("Hide Console"):TranslateT("Show Console");

-		mi.flags = CMIM_NAME | CMIF_TCHAR;;

+		mi.flags = CMIM_NAME | CMIF_TCHAR;

 		CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenu, (LPARAM)&mi);

 	}

 

@@ -360,7 +360,7 @@ static LRESULT CALLBACK SubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lPa
 					return 0;

 			}

 			break;

-   	}

+   	}       

 	return CallWindowProc((WNDPROC)GetWindowLongPtr(hwnd, GWLP_USERDATA),hwnd,msg,wParam,lParam);

 }

 

@@ -382,7 +382,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 		dat->hList = GetDlgItem(hwndDlg, IDC_LIST);

 

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG)dat);

-		SetWindowLongPtr(dat->hwnd, GWLP_USERDATA, SetWindowLongPtr(dat->hwnd, GWLP_WNDPROC, (LONG)SubclassProc));

+		SetWindowLongPtr(dat->hList, GWLP_USERDATA, SetWindowLongPtr(dat->hList, GWLP_WNDPROC, (LONG)SubclassProc));

 

 		// init buttons

 		{

@@ -391,8 +391,8 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 			for(i = 0; i < SIZEOF(ctrls); i++) {

 				hwnd = GetDlgItem(hwndDlg,ctrls[i].control);

 				SendMessage(hwnd, ctrls[i].type, 0, 0);

-				SendMessage(hwnd, BUTTONADDTOOLTIP,(WPARAM)TranslateTS(ctrls[i].tooltip), BATF_TCHAR);

 				SendMessage(hwnd, BM_SETIMAGE,IMAGE_ICON,(LPARAM)hIcons[i+ICON_FIRST]);

+				SendMessage(hwnd, BUTTONADDTOOLTIP,(WPARAM)TranslateTS(ctrls[i].tooltip), BATF_TCHAR);

 			}

 		}

 

@@ -410,13 +410,13 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 		{

 			LVITEM lvi = {0};

 			LVCOLUMN sLC;

-			//ListView_SetUnicodeFormat(dat->hList, FALSE);

-			ListView_SetImageList(dat->hwnd, gImg, LVSIL_SMALL);

+			//ListView_SetUnicodeFormat(dat->hList, TRUE);

+			ListView_SetImageList(dat->hList, gImg, LVSIL_SMALL);

 			sLC.mask = LVCF_FMT | LVCF_WIDTH;

 			sLC.fmt = LVCFMT_LEFT;

 			sLC.cx = 630;

-			ListView_InsertColumn(dat->hwnd, 0, &sLC);

-			ListView_SetExtendedListViewStyle(dat->hwnd, LVS_EX_FULLROWSELECT);

+			ListView_InsertColumn(dat->hList, 0, &sLC);

+			ListView_SetExtendedListViewStyle(dat->hList, LVS_EX_FULLROWSELECT);

 

 			lvi.mask = LVIF_TEXT;

 			if (gIcons)

@@ -426,7 +426,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 			}

 

 			lvi.pszText = TranslateT("*** Console started ***");

-			ListView_InsertItem(dat->hwnd, &lvi);

+			ListView_InsertItem(dat->hList, &lvi);

 		}

 

 		SendMessage(hwndDlg, WM_SIZE, 0, 0);

@@ -455,20 +455,20 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 

 				if (_tcsstr(str, _T("Data received")))

 				{

-					if (gSeparator) ListView_InsertItem(dat->hwnd, &lvi);

+					if (gSeparator) ListView_InsertItem(dat->hList, &lvi);

 					lvi.iImage = IMG_IN;

 				}

 				else

 				if (_tcsstr(str, _T("Data sent")))

 				{

-					if (gSeparator) ListView_InsertItem(dat->hwnd, &lvi);

+					if (gSeparator) ListView_InsertItem(dat->hList, &lvi);

 					lvi.iImage = IMG_OUT;

 				}

 				else

 				{

 					if (gSeparator && dat->newline)

 					{

-						ListView_InsertItem(dat->hwnd, &lvi);

+						ListView_InsertItem(dat->hList, &lvi);

 						dat->newline = 0;

 					}

 					lvi.iImage = IMG_INFO;

@@ -485,7 +485,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 				{

 					szBreak = lvi.pszText[wraplen];

 					lvi.pszText[wraplen] = 0;

-					last = ListView_InsertItem(dat->hwnd, &lvi);

+					last = ListView_InsertItem(dat->hList, &lvi);

 					lvi.pszText[wraplen] = szBreak;

 					len -= wraplen;

 					lvi.pszText = &str[0] + tmplen - len;

@@ -497,7 +497,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 				if (len && lvi.pszText[len-1] == '\r')

 					lvi.pszText[len-1] = 0;

 

-				last = ListView_InsertItem(dat->hwnd, &lvi);

+				last = ListView_InsertItem(dat->hList, &lvi);

 

 				str = _tcstok(NULL, _T("\n"));

 

@@ -507,7 +507,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 

 

 			if ( gVisible && dat == pActive && dat->Scroll == 1 )

-				ListView_EnsureVisible(dat->hwnd, last, FALSE);

+				ListView_EnsureVisible(dat->hList, last, FALSE);

 

 			if (last > gLimit)

 			{

@@ -515,13 +515,13 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 

 				while (idx >= 0)

 				{

-					ListView_DeleteItem(dat->hwnd, idx);

+					ListView_DeleteItem(dat->hList, idx);

 					idx--;

 				}

 			}

 		}

 

-		free((DUMPMSG*)lParam);

+		mir_free((DUMPMSG*)lParam);

 		return TRUE;

 	}

 	case WM_SIZE:

@@ -550,7 +550,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 				lvi.iImage = IMG_INFO;

 				lvi.iItem = 0x7FFFFFFF;

 				lvi.pszText = (dat->Paused) ? TranslateT("*** Console paused ***") : TranslateT("*** Console resumed ***");

-				ListView_InsertItem(dat->hwnd, &lvi);

+				ListView_InsertItem(dat->hList, &lvi);

 				CheckDlgButton(hwndDlg,IDC_PAUSE,(dat->Paused)?BST_CHECKED:BST_UNCHECKED);

 				SendDlgItemMessage(hwndDlg,IDC_PAUSE,BM_SETIMAGE,IMAGE_ICON,(LPARAM)hIcons[((dat->Paused)?ICON_PAUSED:ICON_STARTED)]);

 				break;

@@ -568,19 +568,19 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 				TCHAR szText[128];

 				TCHAR *src, *dst, *buf;

 				int flags = LVNI_BELOW;

-				int count = ListView_GetSelectedCount(dat->hwnd);

+				int count = ListView_GetSelectedCount(dat->hList);

 

 				if (count)

 					flags |= LVNI_SELECTED;

 				else

-					count = ListView_GetItemCount(dat->hwnd);

+					count = ListView_GetItemCount(dat->hList);

 

 				dst = buf = (TCHAR*)malloc((count*(sizeof(szText)+1)+1)*sizeof(TCHAR));

 				if (!buf) break;

 

-				while ((idx = ListView_GetNextItem(dat->hwnd, idx, flags)) > 0)

+				while ((idx = ListView_GetNextItem(dat->hList, idx, flags)) > 0)

 				{

-					ListView_GetItemText(dat->hwnd, idx, 0, szText, sizeof(szText)-1);

+					ListView_GetItemText(dat->hList, idx, 0, szText, sizeof(szText)-1);

 					src = szText;

 					while (*dst++ = *src++);

 					dst--;

@@ -607,24 +607,24 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 			case IDC_DELETE:

 			{

 				int idx = 0;

-				int count = ListView_GetSelectedCount(dat->hwnd);

+				int count = ListView_GetSelectedCount(dat->hList);

 

 				if ( !count ) break;

 

-				if ( count == ListView_GetItemCount(dat->hwnd)) {

+				if ( count == ListView_GetItemCount(dat->hList)) {

 					LVITEM lvi = {0};

-					ListView_DeleteAllItems(dat->hwnd);

+					ListView_DeleteAllItems(dat->hList);

 					lvi.mask = LVIF_TEXT | LVIF_IMAGE;

 					lvi.iImage = IMG_INFO;

 					lvi.pszText = TranslateT("*** Console cleared ***");

-					ListView_InsertItem(dat->hwnd, &lvi);

+					ListView_InsertItem(dat->hList, &lvi);

 					dat->newline = 0;

 					break;

 				}

 

-				while ((idx = ListView_GetNextItem(dat->hwnd, idx, LVNI_BELOW|LVNI_SELECTED)) > 0)

+				while ((idx = ListView_GetNextItem(dat->hList, idx, LVNI_BELOW|LVNI_SELECTED)) > 0)

 				{

-					ListView_DeleteItem(dat->hwnd, idx);

+					ListView_DeleteItem(dat->hList, idx);

 					idx--;

 				}

 				break;

@@ -634,19 +634,19 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 				FILE *fp;

 				TCHAR szFile[MAX_PATH];

 

-				if (!Openfile(szFile, ListView_GetSelectedCount(dat->hwnd))) break;

+				if (!Openfile(szFile, ListView_GetSelectedCount(dat->hList))) break;

 

 				fp = _tfopen(szFile, _T("wt"));

 				if (fp) {

 					int idx = 0;

 					TCHAR szText[128];

 					int flags = LVNI_BELOW;

-					if (ListView_GetSelectedCount(dat->hwnd))

+					if (ListView_GetSelectedCount(dat->hList))

 						flags |= LVNI_SELECTED;

 

-					while ((idx = ListView_GetNextItem(dat->hwnd, idx, flags)) > 0)

+					while ((idx = ListView_GetNextItem(dat->hList, idx, flags)) > 0)

 					{

-						ListView_GetItemText(dat->hwnd, idx, 0, szText, SIZEOF(szText)-1);

+						ListView_GetItemText(dat->hList, idx, 0, szText, SIZEOF(szText)-1);

 						_ftprintf(fp, _T("%s\n"), szText);

 					}

    					fclose(fp);

@@ -675,7 +675,7 @@ static INT_PTR CALLBACK LogDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,LPARA
 		DestroyWindow(hwndDlg);

 		break;

 	case WM_DESTROY:

-		SetWindowLongPtr(dat->hwnd, GWLP_WNDPROC, GetWindowLongPtr(dat->hwnd, GWLP_USERDATA));

+		SetWindowLongPtr(dat->hList, GWLP_WNDPROC, GetWindowLongPtr(dat->hList, GWLP_USERDATA));

 		SendMessage(hwndConsole, HM_REMOVE, 0, (LPARAM)dat);

 		break;

 	}

@@ -702,13 +702,12 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 	switch(message) {

 	case WM_INITDIALOG:

 	{

-		char Title[512];

-		char ProfileName[513];

-		char ProfilePath[513];

-		ProfileName[512] = 0;

-		ProfilePath[512] = 0;

-

+		TCHAR title[MAX_PATH];

+		TCHAR name[MAX_PATH] = {0};

+		TCHAR path[MAX_PATH] = {0};

+		

 		hTabs = GetDlgItem(hwndDlg, IDC_TABS);

+

 		//TabCtrl_SetMinTabWidth(hTabs, 100);

 

 		// restore position

@@ -718,15 +717,13 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 			CallService(MS_UTILS_RESTOREWINDOWPOSITION, RWPF_HIDDEN, (LPARAM)&swp);

 		}

 

-		if (CallService(MS_DB_GETPROFILENAME,(WPARAM)512,(LPARAM)ProfileName))

-			ProfileName[0] = 0;

+		CallService(MS_DB_GETPROFILENAMET,(WPARAM)MAX_PATH,(LPARAM)name);

 

-		if (CallService(MS_DB_GETPROFILEPATH,(WPARAM)512,(LPARAM)ProfilePath))

-			ProfilePath[0] = 0;

+		CallService(MS_DB_GETPROFILEPATHT,(WPARAM)MAX_PATH,(LPARAM)path);

 

-		mir_snprintf(Title, sizeof(Title), "%s - %s\\%s", Translate("Miranda Console"), ProfilePath, ProfileName);

+		mir_sntprintf(title, MAX_PATH, _T("%s - %s\\%s"), TranslateT("Miranda Console"), path, name);

 

-		SetWindowTextA(hwndDlg, Title);

+		SetWindowText(hwndDlg, title);

 		SendMessage(hwndDlg,WM_SETICON,ICON_BIG,(LPARAM)hIcons[0]);

 

 		hwndConsole = hwndDlg;

@@ -742,7 +739,10 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 		LOGWIN lw2;

 		DUMPMSG *dumpMsg = (DUMPMSG*)lParam;

 

-		if (!pActive) break;

+		if (!pActive) {

+			mir_free(dumpMsg);

+			break;

+		}

 

 		if (!gSingleMode)

 		{

@@ -797,15 +797,15 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 

 		if (pActive)

 		{

-			col = ListView_GetBkColor(pActive->hwnd);

-			ListView_SetBkColor(lw->hwnd, col);

-			ListView_SetTextBkColor(lw->hwnd, col);

+			col = ListView_GetBkColor(pActive->hList);

+			ListView_SetBkColor(lw->hList, col);

+			ListView_SetTextBkColor(lw->hList, col);

 

-			col = ListView_GetTextColor(pActive->hwnd);

-			ListView_SetTextColor(lw->hwnd, col);

+			col = ListView_GetTextColor(pActive->hList);

+			ListView_SetTextColor(lw->hList, col);

 

 			if (hfLogFont)

-				SendMessage(lw->hwnd, WM_SETFONT, (WPARAM)hfLogFont, (LPARAM)TRUE);

+				SendMessage(lw->hList, WM_SETFONT, (WPARAM)hfLogFont, (LPARAM)TRUE);

 		}

 

 		// hide startup window

@@ -849,7 +849,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 					SendMessage(pActive->hwnd, WM_SIZE, 0, 0);

 					ScrollDown(pActive);

 					ShowWindow(pActive->hwnd, SW_SHOWNOACTIVATE);

-					SetFocus(pActive->hwnd);

+					SetFocus(pActive->hList);

 				}

 				else

 					pActive = NULL;

@@ -869,9 +869,9 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 		for ( i = 0; i < lModules.realCount; i++ )

 		{

 			lw = (LOGWIN*)lModules.items[i];

-			ListView_SetTextColor(lw->hwnd, (COLORREF)lParam);

+			ListView_SetTextColor(lw->hList, (COLORREF)lParam);

 			if (wParam)

-				SendMessage(lw->hwnd, WM_SETFONT, wParam, (LPARAM)TRUE);

+				SendMessage(lw->hList, WM_SETFONT, wParam, (LPARAM)TRUE);

 		}

 		return TRUE;

 	}

@@ -883,10 +883,10 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 		for ( i = 0; i < lModules.realCount; i++ )

 		{

 			lw = (LOGWIN*)lModules.items[i];

-			ListView_SetBkColor(lw->hwnd, (COLORREF)lParam);

-			ListView_SetTextBkColor(lw->hwnd, (COLORREF)lParam);

+			ListView_SetBkColor(lw->hList, (COLORREF)lParam);

+			ListView_SetTextBkColor(lw->hList, (COLORREF)lParam);

 			if (wParam)

-				SendMessage(lw->hwnd, WM_SETFONT, wParam, (LPARAM)TRUE);

+				SendMessage(lw->hList, WM_SETFONT, wParam, (LPARAM)TRUE);

 		}

 		return TRUE;

 	}

@@ -933,7 +933,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 	}

  	case WM_SETFOCUS:

 		if (pActive) {

-			SetFocus(pActive->hwnd);

+			SetFocus(pActive->hList);

 		}

 		return TRUE;

 	case WM_NOTIFY:

@@ -959,7 +959,7 @@ static INT_PTR CALLBACK ConsoleDlgProc(HWND hwndDlg,UINT message,WPARAM wParam,L
 						ScrollDown(pActive);

 						ShowWindow(hOld, SW_HIDE);

 						ShowWindow(pActive->hwnd, SW_SHOWNOACTIVATE);

-						SetFocus(pActive->hwnd);

+						SetFocus(pActive->hList);

 					} else

 						SendMessage(pActive->hwnd, WM_SIZE, 0, 0);

 				}

@@ -1050,7 +1050,7 @@ static int OnFastDump(WPARAM wParam,LPARAM lParam)
 		DWORD headlen = (DWORD)strlen(logMsg->pszHead);

 		DWORD msglen = (DWORD)strlen(logMsg->pszMsg);

 		DWORD len = (headlen + msglen + 1) * sizeof(TCHAR) + sizeof(DUMPMSG);

-		DUMPMSG *dumpMsg = (DUMPMSG*)malloc( len );

+		DUMPMSG *dumpMsg = (DUMPMSG*)mir_alloc( len );

 		TCHAR *str = dumpMsg->szMsg;

 

 		strncpy(dumpMsg->szModule, ((NETLIBUSER*)wParam)->szDescriptiveName, sizeof(dumpMsg->szModule))[ sizeof(dumpMsg->szModule)-1 ] = 0;

@@ -1142,8 +1142,8 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			switch (LOWORD(wParam)) {

 				case IDC_RESTART:

 				{

-				    if (!pActive) break;

-				    SaveSettings(hwndDlg);

+					if (!pActive) break;

+					SaveSettings(hwndDlg);

 					PostMessage(hwndConsole, HM_RESTART, 0, 0);

 					break;

 				}

@@ -1169,7 +1169,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 					{

 						case PSN_APPLY:

 						{

-						    SaveSettings(hwndDlg);

+							SaveSettings(hwndDlg);

 							break;

 						}

 					}

@@ -1386,7 +1386,8 @@ static UINT logicons[] = {IDI_EMPTY, IDI_ARROW, IDI_IN, IDI_OUT, IDI_INFO};
 void InitConsole()

 {

 	int i;

-	HICON hi;


+	HICON hi;

+

 	lModules.sortFunc = (FSortFunc)stringCompare;

 	lModules.increment = 5;

 

diff --git a/plugins/Console/Console_history.txt b/plugins/Console/Console_history.txt
index 0801dc00cd..337cf95b0c 100644
--- a/plugins/Console/Console_history.txt
+++ b/plugins/Console/Console_history.txt
@@ -2,6 +2,11 @@ PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND...
 ONLY MORAL SUPPORT IN SPECIAL CASES CAN BE PROVIDED 8-)

 --------------------------------------------------------------------------------

 

+v7.3

+

+[-] bug fixes

+

+

 v7.2

 

 [+] console hot restart (to apply new options)

diff --git a/plugins/Console/resource.rc b/plugins/Console/resource.rc
index c71241fa0a..77507e3c77 100644
--- a/plugins/Console/resource.rc
+++ b/plugins/Console/resource.rc
@@ -43,23 +43,23 @@ BEGIN
     CONTROL         "List1",IDC_LIST,"SysListView32",LVS_REPORT |

                     LVS_SHAREIMAGELISTS | LVS_NOCOLUMNHEADER |

                     LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,0,18,335,239

-    CONTROL         "&S",IDC_SAVE,"MButtonClass",WS_TABSTOP,0,1,14,16,

+    CONTROL         "",IDC_SAVE,"MButtonClass",WS_TABSTOP,0,1,14,16,

                     0x18000000L

-    CONTROL         "&P",IDC_PAUSE,"MButtonClass",WS_TABSTOP,16,1,14,16,

+    CONTROL         "",IDC_PAUSE,"MButtonClass",WS_TABSTOP,16,1,14,16,

                     0x18000000L

-    CONTROL         "&Q",IDC_SCROLL,"MButtonClass",WS_TABSTOP,32,1,14,16,

+    CONTROL         "",IDC_SCROLL,"MButtonClass",WS_TABSTOP,32,1,14,16,

                     0x18000000L

-    CONTROL         "&C",IDC_COPY,"MButtonClass",WS_TABSTOP,48,1,14,16,

+    CONTROL         "",IDC_COPY,"MButtonClass",WS_TABSTOP,48,1,14,16,

                     0x18000000L

-    CONTROL         "&D",IDC_DELETE,"MButtonClass",WS_TABSTOP,64,1,14,16,

+    CONTROL         "",IDC_DELETE,"MButtonClass",WS_TABSTOP,64,1,14,16,

                     0x18000000L

-    CONTROL         "&O",IDC_OPTIONS,"MButtonClass",WS_TABSTOP,80,1,14,16,

+    CONTROL         "",IDC_OPTIONS,"MButtonClass",WS_TABSTOP,80,1,14,16,

                     0x18000000L

     CONTROL         "",IDC_STARTALL,"MButtonClass",WS_TABSTOP,278,1,14,16,

                     0x18000000L

     CONTROL         "",IDC_PAUSEALL,"MButtonClass",WS_TABSTOP,294,1,14,16,

                     0x18000000L

-    CONTROL         "&W",IDC_CLOSE,"MButtonClass",WS_TABSTOP,320,1,14,16,

+    CONTROL         "",IDC_CLOSE,"MButtonClass",WS_TABSTOP,320,1,14,16,

                     0x18000000L

 END

 

diff --git a/plugins/Console/version.h b/plugins/Console/version.h
index a848f99fe5..c91b5628e0 100644
--- a/plugins/Console/version.h
+++ b/plugins/Console/version.h
@@ -22,16 +22,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 

-#define __FILEVERSION_STRING 0,0,7,2

-#define __VERSION_STRING     "0.0.7.2"

-#define __VERSION_DWORD      0x00000702

+#define __FILEVERSION_STRING 0,0,7,3

+#define __VERSION_STRING     "0.0.7.3"

+#define __VERSION_DWORD      0x00000703

 

 

-#define __PLUGIN_DESC        "Console log window for Miranda 0.8.0.3+"

+#define __PLUGIN_DESC        "Console log window for Miranda"

 #define __PLUGIN_LONGDESC    __PLUGIN_DESC ". ["__DATE__"  "__TIME__"]"

 #define __PLUGIN_AUTHOR      "Bio"

-#define __PLUGIN_EMAIL       "bio@msx.ru"

-#define __PLUGIN_RIGHTS      "© 2005-2009 Bio"

+#define __PLUGIN_EMAIL       "bio@ktaspb.ru"

+#define __PLUGIN_RIGHTS      "© 2005-2012 Bio"

 #define __PLUGIN_FILE        "Console.dll"

 #define __PLUGIN_SHORTNAME   "Console"