version update

git-svn-id: svn://svn.code.sf.net/p/miranda/svn/branches/stable@14207 43f3a57c-415d-409d-a226-9ac53bca7782

5 files changed, 6 insertions, 8 deletions

diff --git a/miranda/plugins/tabsrmm/chat/window.cpp b/miranda/plugins/tabsrmm/chat/window.cpp
index 70f5c5824..447530e7c 100644
--- a/miranda/plugins/tabsrmm/chat/window.cpp
+++ b/miranda/plugins/tabsrmm/chat/window.cpp
@@ -3741,7 +3741,7 @@ LABEL_SHOWWINDOW:
 				DestroyWindow(dat->hwndTip);

 

 			if (hCurHyperlinkHand)

- 						DestroyCursor(hCurHyperlinkHand);

+				DestroyCursor(hCurHyperlinkHand);

 

 			i = GetTabIndexFromHWND(hwndTab, hwndDlg);

 			if (i >= 0) {

diff --git a/miranda/plugins/tabsrmm/include/version.h b/miranda/plugins/tabsrmm/include/version.h
index 77e8bcbc9..8f570c857 100644
--- a/miranda/plugins/tabsrmm/include/version.h
+++ b/miranda/plugins/tabsrmm/include/version.h
@@ -1,7 +1,7 @@
-#define VER_PLAIN	"3,0,23,0"

+#define VER_PLAIN	"3,0,49,0"

 #define _VER_MAJOR	3

 #define _VER_MINOR  0

-#define _VER_REVISION 23

+#define _VER_REVISION 49

 #define _VER_BUILD	0

 

 #if defined(_WIN64)

diff --git a/miranda/plugins/tabsrmm/src/container.cpp b/miranda/plugins/tabsrmm/src/container.cpp
index cceb04878..17317e292 100644
--- a/miranda/plugins/tabsrmm/src/container.cpp
+++ b/miranda/plugins/tabsrmm/src/container.cpp
@@ -1265,7 +1265,6 @@ buttons_done:
 

 			mmi->ptMinTrackSize.x = 275;

 			mmi->ptMinTrackSize.y = 130;

-

 			GetClientRect(GetDlgItem(hwndDlg, IDC_MSGTABS), &rc);

 			if(pContainer->hwndActive)								// at container creation time, there is no hwndActive yet..

 				GetClientRect(pContainer->hwndActive, &rcClient);

diff --git a/miranda/plugins/tabsrmm/src/containeroptions.cpp b/miranda/plugins/tabsrmm/src/containeroptions.cpp
index 8a0f04c0b..6d77ff272 100644
--- a/miranda/plugins/tabsrmm/src/containeroptions.cpp
+++ b/miranda/plugins/tabsrmm/src/containeroptions.cpp
@@ -163,7 +163,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 

 	switch (msg) {

 		case WM_INITDIALOG: {

-			TCHAR 			szNewTitle[128];

+			wchar_t			szNewTitle[128];

 			TContainerData *pContainer = 0;

 			int   			i, j;

 			TVINSERTSTRUCT 	tvis = {0};

@@ -323,7 +323,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 						return TRUE;

 					goto do_apply;

 				case IDC_SELECTTHEME: {

-					const TCHAR *szFileName = GetThemeFileName(0);

+					const wchar_t *szFileName = GetThemeFileName(0);

 

 					if (PathFileExists(szFileName)) {

 						SetDlgItemText(hwndDlg, IDC_THEME, szFileName);

@@ -353,7 +353,7 @@ INT_PTR CALLBACK DlgProcContainerOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 					pContainer->szRelThemeFile[0] = pContainer->szAbsThemeFile[0] = 0;

 

 					if (GetWindowTextLengthA(GetDlgItem(hwndDlg, IDC_THEME)) > 0) {

-						TCHAR	szFinalThemeFile[MAX_PATH], szFilename[MAX_PATH];

+						wchar_t	szFinalThemeFile[MAX_PATH], szFilename[MAX_PATH];

 

 						GetDlgItemText(hwndDlg, IDC_THEME, szFilename, MAX_PATH);

 						szFilename[MAX_PATH - 1] = 0;

diff --git a/miranda/plugins/tabsrmm/src/msglog.cpp b/miranda/plugins/tabsrmm/src/msglog.cpp
index e3dce31d8..cda1cfaec 100644
--- a/miranda/plugins/tabsrmm/src/msglog.cpp
+++ b/miranda/plugins/tabsrmm/src/msglog.cpp
@@ -986,7 +986,6 @@ static char *Template_CreateRTFFromDbEvent(struct TWindowData *dat, HANDLE hCont
 						AppendToBuffer(&buffer, &bufferEnd, &bufferAlloced, "%s ", GetRTFFont(isSent ? MSGFONTID_MYNAME + iFontIDOffset : MSGFONTID_YOURNAME + iFontIDOffset));

 					if (isSent)

 						AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, szMyName, MAKELONG(isSent, dat->isHistory));

-					//AppendToBufferWithRTF(0, &buffer, &bufferEnd, &bufferAlloced, "%s", szMyName);

 					else

 						AppendUnicodeToBuffer(&buffer, &bufferEnd, &bufferAlloced, szYourName, MAKELONG(isSent, dat->isHistory));

 					break;