tabSRMM button sync

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

7 files changed, 22 insertions, 23 deletions

diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp
index 2401db2d0a..0925f5209b 100644
--- a/plugins/TabSRMM/chat/window.cpp
+++ b/plugins/TabSRMM/chat/window.cpp
@@ -2053,9 +2053,9 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 			GetMYUIN(dat);

 			GetMyNick(dat);

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTHEMED, PluginConfig.m_bIsXP, 0);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTHEMEDBTN, PluginConfig.m_bIsXP, 0);

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASFLATBTN, TRUE, 0);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASFLATBTN, FALSE, 0);

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

 			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Expand or collapse the side bar"), 1);

 

diff --git a/plugins/TabSRMM/include/themes.h b/plugins/TabSRMM/include/themes.h
index 2079b2eaa0..a714f4040d 100644
--- a/plugins/TabSRMM/include/themes.h
+++ b/plugins/TabSRMM/include/themes.h
@@ -57,17 +57,16 @@ typedef struct {
 	HANDLE  hThemeButton;

 	HANDLE  hThemeToolbar;

 	BOOL    bThemed;

-	BOOL	bToolbarButton;			// is a toolbar button (important for aero background rendering)

-	BOOL	bTitleButton;

-	TCHAR	cHot;

+	BOOL	  bToolbarButton;			// is a toolbar button (important for aero background rendering)

+	BOOL	  bTitleButton;

+	TCHAR	  cHot;

 	int     flatBtn;

 	int     dimmed;

-	HICON	overlay;

-	struct TContainerData *pContainer;

+	HICON	  overlay;

+	struct  TContainerData *pContainer;

 	CSideBarButton *sitem;

 } MButtonCtrl;

 

-#define BUTTONSETASTHEMED        (BUTTONSETASFLATBTN + 10)

 #define BUTTONSETASDIMMED        (BUTTONSETASFLATBTN + 11)

 #define BUTTONSETCONTAINER       (BUTTONSETASFLATBTN + 12)

 #define BUTTONSETASTITLE         (BUTTONSETASFLATBTN + 13)

diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp
index 7c47c1d05a..2c911bc849 100644
--- a/plugins/TabSRMM/src/TSButton.cpp
+++ b/plugins/TabSRMM/src/TSButton.cpp
@@ -285,7 +285,7 @@ nonflat_themed:
 		}

 

 		/*

-		 * render content
+		 * render content

 		 */

 		if (ctl->arrow) {

 			rcContent.top += 2;

@@ -553,7 +553,7 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg,  WPARAM wParam,
 			bct->flatBtn = (wParam != 0);

 			InvalidateRect(bct->hwnd, NULL, TRUE);

 			break;

-		case BUTTONSETASTHEMED:

+		case BUTTONSETASTHEMEDBTN:

 			bct->bThemed = (wParam != 0);

 			break;

 		case BUTTONSETASDIMMED:

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 29d15161fb..b75d554fb3 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -567,8 +567,8 @@ void TSAPI BB_InitDlgButtons(TWindowData *dat)
 			if (!cbd->bDummy && !GetDlgItem(hdlg, cbd->dwButtonCID))

 				hwndBtn = CreateWindowEx(0, _T("TSButtonClass"), _T(""), WS_CHILD | WS_VISIBLE | WS_TABSTOP, rect.right - rwidth + gap, splitterY, cbd->iButtonWidth, DPISCALEY_S(22), hdlg, (HMENU) cbd->dwButtonCID, g_hInst, NULL);

 			if (!cbd->bDummy && hwndBtn) {

-				SendMessage(hwndBtn, BUTTONSETASFLATBTN, TRUE, 0);

-				SendMessage(hwndBtn, BUTTONSETASTHEMED, isThemed != 0, 0);

+				SendMessage(hwndBtn, BUTTONSETASFLATBTN, FALSE, 0);

+				SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, isThemed != 0, 0);

 				if (cbd->hIcon)

 					SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)cbd->hIcon));

 				if (cbd->ptszTooltip)

@@ -606,7 +606,7 @@ void TSAPI BB_InitDlgButtons(TWindowData *dat)
 				dat->iButtonBarReallyNeeds += cbd->iButtonWidth + gap;

 			if (!cbd->bDummy && hwndBtn) {

 				SendMessage(hwndBtn, BUTTONSETASFLATBTN, TRUE, 0);

-				SendMessage(hwndBtn, BUTTONSETASTHEMED, isThemed != 0, 0);

+				SendMessage(hwndBtn, BUTTONSETASTHEMEDBTN, isThemed != 0, 0);

 				if (cbd->hIcon)

 					SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)cbd->hIcon));

 				if (cbd->ptszTooltip)

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index c174aed362..7465fe311f 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1460,11 +1460,11 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				isThemed = FALSE;

 			}

 

-			SendMessage(GetDlgItem(hwndDlg, IDC_ADD), BUTTONSETASFLATBTN, TRUE, 0);

-			SendMessage(GetDlgItem(hwndDlg, IDC_CANCELADD), BUTTONSETASFLATBTN, TRUE, 0);

+			SendMessage(GetDlgItem(hwndDlg, IDC_ADD), BUTTONSETASFLATBTN, FALSE, 0);

+			SendMessage(GetDlgItem(hwndDlg, IDC_CANCELADD), BUTTONSETASFLATBTN, FALSE, 0);

 

-			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASFLATBTN, TRUE, 0);

-			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASTHEMED, isThemed != 0, 0);

+			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASFLATBTN, FALSE, 0);

+			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASTHEMEDBTN, isThemed != 0, 0);

 			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETCONTAINER, (LPARAM)m_pContainer, 0);

 			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

 

@@ -1487,8 +1487,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				UINT _ctrls[] = {IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER};

 				for(i = 0; i < 3; i++) {

 					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASPUSHBTN, TRUE, 0);

-					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASFLATBTN, TRUE, 0);

-					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASTHEMED, TRUE, 0);

+					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASFLATBTN, FALSE, 0);

+					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASTHEMEDBTN, TRUE, 0);

 				}

 			}

 

diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp
index 481e00f171..f3c514c588 100644
--- a/plugins/TabSRMM/src/sidebar.cpp
+++ b/plugins/TabSRMM/src/sidebar.cpp
@@ -111,8 +111,8 @@ void CSideBarButton::_create()
 

 	if(m_hwnd) {

 		::SendMessage(m_hwnd, BUTTONSETASSIDEBARBUTTON, (WPARAM)this, 0);

-		::SendMessage(m_hwnd, BUTTONSETASFLATBTN, TRUE,  0);

-		::SendMessage(m_hwnd, BUTTONSETASTHEMED, TRUE,  0);

+		::SendMessage(m_hwnd, BUTTONSETASFLATBTN, FALSE,  0);

+		::SendMessage(m_hwnd, BUTTONSETASTHEMEDBTN, TRUE,  0);

 		::SendMessage(m_hwnd, BUTTONSETCONTAINER, (LPARAM)m_sideBar->getContainer(), 0);

 		m_buttonControl = (MButtonCtrl *)::GetWindowLongPtr(m_hwnd, 0);

 	}

@@ -354,7 +354,7 @@ void CSideBarButton::activateSession() const
 }

 

 /**

- * show the context menu (same as on tabs
+ * show the context menu (same as on tabs

  */

 void CSideBarButton::invokeContextMenu()

 {

diff --git a/plugins/WhenWasIt/hooked_events.cpp b/plugins/WhenWasIt/hooked_events.cpp
index 3b9d2dadef..e6be71994b 100644
--- a/plugins/WhenWasIt/hooked_events.cpp
+++ b/plugins/WhenWasIt/hooked_events.cpp
@@ -165,7 +165,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
 	Hotkey_Register(&hotkey);

 		

 	hotkey.pszName = "wwi_check_birthdays";

-	hotkey.ptszDescription = LPGENT("Check for birthdays");

+	hotkey.pszDescription = LPGEN("Check for birthdays");

 	hotkey.pszService = MS_WWI_CHECK_BIRTHDAYS;

 	Hotkey_Register(&hotkey);