button control moved to wParam everywhere

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

7 files changed, 63 insertions, 58 deletions

diff --git a/plugins/TabSRMM/chat/window.cpp b/plugins/TabSRMM/chat/window.cpp
index 175dc95d35..2401db2d0a 100644
--- a/plugins/TabSRMM/chat/window.cpp
+++ b/plugins/TabSRMM/chat/window.cpp
@@ -2012,7 +2012,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			BB_InitDlgButtons(dat);

 			DM_InitTip(dat);

 

-			SendMessage(GetDlgItem(hwndDlg,IDC_COLOR), BUTTONSETASPUSHBTN, 0, 0);

+			SendMessage(GetDlgItem(hwndDlg,IDC_COLOR), BUTTONSETASPUSHBTN, TRUE, 0);

 

 			OldSplitterProc = (WNDPROC)SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SPLITTERX), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc);

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_SPLITTERY), GWLP_WNDPROC, (LONG_PTR)SplitterSubclassProc);

@@ -2053,10 +2053,10 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 

 			GetMYUIN(dat);

 			GetMyNick(dat);

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASFLATBTN + 10, 0, PluginConfig.m_bIsXP);

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASFLATBTN + 12, 0, (LPARAM)dat->pContainer);

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

-			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTOOLBARBUTTON, 0, 1);

+			SendDlgItemMessage(hwndDlg, IDC_CHAT_TOGGLESIDEBAR, BUTTONSETASTHEMED, 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, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

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

 

 			dat->hwndIEView = dat->hwndHPP = 0;

@@ -2101,13 +2101,13 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			SendDlgItemMessage(hwndDlg, IDC_CHAT_LOG, EM_SETBKGNDCOLOR, 0, colour);

 

 			DM_InitRichEdit(dat);

-			SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETASFLATBTN + 14, 0, 0);

+			SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETASNORMAL, TRUE, 0);

 			{

 				SendMessage(GetDlgItem(hwndDlg, IDC_LIST), LB_SETITEMHEIGHT, 0, (LPARAM)g_Settings.iNickListFontHeight);

 				InvalidateRect(GetDlgItem(hwndDlg, IDC_LIST), NULL, TRUE);

 			}

-			SendDlgItemMessage(hwndDlg, IDC_FILTER, BUTTONSETOVERLAYICON, 0,

-							   (LPARAM)(si->bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled));

+			SendDlgItemMessage(hwndDlg, IDC_FILTER, BUTTONSETOVERLAYICON, 

+							   (LPARAM)(si->bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);

 			SendMessage(hwndDlg, WM_SIZE, 0, 0);

 			SendMessage(hwndDlg, GC_REDRAWLOG2, 0, 0);

 		}

@@ -3222,7 +3222,7 @@ LABEL_SHOWWINDOW:
 							UpdateReadChars(dat);

 						dat->dwLastActivity = GetTickCount();

 						dat->pContainer->dwLastActivity = dat->dwLastActivity;

-						SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETASFLATBTN + 14, GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)) != 0, 0);

+						SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETASNORMAL, GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)) != 0, 0);

 						Utils::enableDlgControl(hwndDlg, IDOK, GetRichTextLength(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE)) != 0);

 					}

 					break;

@@ -3288,8 +3288,8 @@ LABEL_SHOWWINDOW:
 					} else

 						si->bFilterEnabled = !si->bFilterEnabled;

 

-					SendDlgItemMessage(hwndDlg, IDC_FILTER, BUTTONSETOVERLAYICON, 0,

-									   (LPARAM)(si->bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled));

+					SendDlgItemMessage(hwndDlg, IDC_FILTER, BUTTONSETOVERLAYICON,

+									   (LPARAM)(si->bFilterEnabled ? PluginConfig.g_iconOverlayEnabled : PluginConfig.g_iconOverlayDisabled), 0);

 

 					if (si->bFilterEnabled && M->GetByte("Chat", "RightClickFilter", 0) == 0) {

 						SendMessage(hwndDlg, GC_SHOWFILTERMENU, 0, 0);

diff --git a/plugins/TabSRMM/include/themes.h b/plugins/TabSRMM/include/themes.h
index e06110c6f3..2079b2eaa0 100644
--- a/plugins/TabSRMM/include/themes.h
+++ b/plugins/TabSRMM/include/themes.h
@@ -67,9 +67,15 @@ typedef struct {
 	CSideBarButton *sitem;

 } MButtonCtrl;

 

+#define BUTTONSETASTHEMED        (BUTTONSETASFLATBTN + 10)

+#define BUTTONSETASDIMMED        (BUTTONSETASFLATBTN + 11)

+#define BUTTONSETCONTAINER       (BUTTONSETASFLATBTN + 12)

+#define BUTTONSETASTITLE         (BUTTONSETASFLATBTN + 13)

+#define BUTTONSETASNORMAL        (BUTTONSETASFLATBTN + 14)

+#define BUTTONGETSTATEID         (BUTTONSETASFLATBTN + 15)

 #define BUTTONSETASTOOLBARBUTTON (BUTTONSETASFLATBTN + 21)

 #define BUTTONSETASSIDEBARBUTTON (BUTTONSETASFLATBTN + 22)

-#define BUTTONSETOVERLAYICON	 (BUTTONSETASFLATBTN + 23)

+#define BUTTONSETOVERLAYICON	   (BUTTONSETASFLATBTN + 23)

 

 struct AeroEffect {

 	TCHAR		tszName[40];

diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp
index 57c3221f38..7c47c1d05a 100644
--- a/plugins/TabSRMM/src/TSButton.cpp
+++ b/plugins/TabSRMM/src/TSButton.cpp
@@ -542,43 +542,43 @@ static LRESULT CALLBACK TSButtonWndProc(HWND hwndDlg, UINT msg,  WPARAM wParam,
 			InvalidateRect(bct->hwnd, NULL, TRUE);

 			break;

 		case BUTTONSETDEFAULT:

-			bct->defbutton = wParam ? 1 : 0;

+			bct->defbutton = (wParam != 0);

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

 			break;

 		case BUTTONSETASPUSHBTN:

-			bct->pushBtn = 1;

+			bct->pushBtn = (wParam != 0);

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

 			break;

 		case BUTTONSETASFLATBTN:

-			bct->flatBtn = lParam == 0 ? 1 : 0;

+			bct->flatBtn = (wParam != 0);

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

 			break;

-		case BUTTONSETASFLATBTN + 10:

-			bct->bThemed = lParam ? TRUE : FALSE;

+		case BUTTONSETASTHEMED:

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

 			break;

-		case BUTTONSETASFLATBTN + 11:

-			bct->dimmed = lParam ? TRUE : FALSE;

+		case BUTTONSETASDIMMED:

+			bct->dimmed = (wParam != 0);

 			break;

-		case BUTTONSETASFLATBTN + 12:

-			bct->pContainer = (struct TContainerData *)lParam;

+		case BUTTONSETCONTAINER:

+			bct->pContainer = (struct TContainerData *)wParam;

 			break;

-		case BUTTONSETASFLATBTN + 13:

+		case BUTTONSETASTITLE:

 			bct->bTitleButton = TRUE;

 			break;

-		case BUTTONSETASFLATBTN + 14:

+		case BUTTONSETASNORMAL:

 			bct->stateId = (wParam) ? PBS_NORMAL : PBS_DISABLED;

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

 			break;

-		case BUTTONSETASFLATBTN + 15:

+		case BUTTONGETSTATEID:

 			return bct->stateId;

 		case BUTTONSETASTOOLBARBUTTON:

-			bct->bToolbarButton = lParam;

+			bct->bToolbarButton = wParam;

 			break;

 		case BUTTONSETASSIDEBARBUTTON:

-			bct->sitem = reinterpret_cast<CSideBarButton *>(lParam);

+			bct->sitem = reinterpret_cast<CSideBarButton *>(wParam);

 			break;

 		case BUTTONSETOVERLAYICON:

-			bct->overlay = (HICON)lParam;

+			bct->overlay = (HICON)wParam;

 			break;

 		case BUTTONADDTOOLTIP: {

 			TOOLINFO ti;

diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp
index 43115a116b..29d15161fb 100644
--- a/plugins/TabSRMM/src/buttonsbar.cpp
+++ b/plugins/TabSRMM/src/buttonsbar.cpp
@@ -213,7 +213,7 @@ void CB_ChangeButton(HWND hwndDlg, struct TWindowData *dat, CustomButtonData* cb
 			SendMessage(hwndBtn, BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICONBYHANDLE, 0, (LPARAM)cbd->hIcon));

 		if (cbd->ptszTooltip)

 			SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(cbd->ptszTooltip), 0);

-		SendMessage(hwndBtn, BUTTONSETASFLATBTN + 12, 0, (LPARAM)dat->pContainer);

+		SendMessage(hwndBtn, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);

 	}

 }

 

@@ -567,19 +567,19 @@ 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, 0, 0);

-				SendMessage(hwndBtn, BUTTONSETASFLATBTN + 10, 0, isThemed ? 1 : 0);

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

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

 				if (cbd->hIcon)

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

 				if (cbd->ptszTooltip)

 					SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(cbd->ptszTooltip), 0);

-				SendMessage(hwndBtn, BUTTONSETASFLATBTN + 12, 0, (LPARAM)dat->pContainer);

-				SendMessage(hwndBtn, BUTTONSETASTOOLBARBUTTON, 0, 1);

+				SendMessage(hwndBtn, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);

+				SendMessage(hwndBtn, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

 

 				if (hwndBtn && cbd->dwArrowCID)

 					SendMessage(hwndBtn, BUTTONSETARROW, cbd->dwArrowCID, 0);

 				if (hwndBtn && cbd->bPushButton)

-					SendMessage(hwndBtn, BUTTONSETASPUSHBTN, 0, 0);

+					SendMessage(hwndBtn, BUTTONSETASPUSHBTN, TRUE, 0);

 			}

 		} else if (GetDlgItem(hdlg, cbd->dwButtonCID))

 			DestroyWindow(GetDlgItem(hdlg, cbd->dwButtonCID));

@@ -605,19 +605,19 @@ void TSAPI BB_InitDlgButtons(TWindowData *dat)
 			if (!cbd->bHidden && !cbd->bCanBeHidden)

 				dat->iButtonBarReallyNeeds += cbd->iButtonWidth + gap;

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

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

-				SendMessage(hwndBtn, BUTTONSETASFLATBTN + 10, 0, isThemed ? 1 : 0);

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

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

 				if (cbd->hIcon)

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

 				if (cbd->ptszTooltip)

 					SendMessage(hwndBtn, BUTTONADDTOOLTIP, (WPARAM)TranslateTS(cbd->ptszTooltip), 0);

-				SendMessage(hwndBtn, BUTTONSETASFLATBTN + 12, 0, (LPARAM)dat->pContainer);

-				SendMessage(hwndBtn, BUTTONSETASTOOLBARBUTTON, 0, 1);

+				SendMessage(hwndBtn, BUTTONSETCONTAINER, (LPARAM)dat->pContainer, 0);

+				SendMessage(hwndBtn, BUTTONSETASTOOLBARBUTTON, TRUE, 0);

 

 				if (hwndBtn && cbd->dwArrowCID)

 					SendMessage(hwndBtn, BUTTONSETARROW, cbd->dwArrowCID, 0);

 				if (hwndBtn && cbd->bPushButton)

-					SendMessage(hwndBtn, BUTTONSETASPUSHBTN, 0, 0);

+					SendMessage(hwndBtn, BUTTONSETASPUSHBTN, TRUE, 0);

 			}

 		} else if (GetDlgItem(hdlg, cbd->dwButtonCID))

 			DestroyWindow(GetDlgItem(hdlg, cbd->dwButtonCID));

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

 			}

 

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

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

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

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

 

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

-			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASFLATBTN + 10, 0, isThemed ? 1 : 0);

-			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASFLATBTN + 12, 0, (LPARAM)m_pContainer);

-			SendDlgItemMessage(hwndDlg, IDC_TOGGLESIDEBAR, BUTTONSETASTOOLBARBUTTON, 0, 1);

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

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

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

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

 

 			TABSRMM_FireEvent(dat->hContact, hwndDlg, MSG_WINDOW_EVT_OPENING, 0);

 

@@ -1486,10 +1486,9 @@ 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, 0, 0);

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

-					SendDlgItemMessage(hwndDlg, _ctrls[i], BUTTONSETASFLATBTN + 10, 0, 1);

-

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

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

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

 				}

 			}

 

@@ -2389,7 +2388,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				dat->hTabIcon = dat->hTabStatusIcon = MY_GetContactIcon(dat);

 				if (M->GetByte("use_xicons", 1))

 					dat->hXStatusIcon = GetXStatusIcon(dat);

-				SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, BUTTONSETASFLATBTN + 11, 0, dat->dwFlagsEx & MWF_SHOW_ISIDLE ? 1 : 0);

+				SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, BUTTONSETASDIMMED, (dat->dwFlagsEx & MWF_SHOW_ISIDLE) != 0, 0);

 				SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)(dat->hXStatusIcon ? dat->hXStatusIcon : dat->hTabIcon));

 

 				if (m_pContainer->hwndActive == hwndDlg)

@@ -2427,7 +2426,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if (buttonicons[i].id == -1)

 					break;

 				SendDlgItemMessage(hwndDlg, buttonicons[i].id, BM_SETIMAGE, IMAGE_ICON, (LPARAM)*buttonicons[i].pIcon);

-				SendDlgItemMessage(hwndDlg, buttonicons[i].id, BUTTONSETASFLATBTN + 12, 0, (LPARAM)m_pContainer);

+				SendDlgItemMessage(hwndDlg, buttonicons[i].id, BUTTONSETCONTAINER, (LPARAM)m_pContainer, 0);

 			}

 			BB_UpdateIcons(hwndDlg, dat);

 			SendMessage(hwndDlg, DM_UPDATEWINICON, 0, 0);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 27bb4741cb..770b415110 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -2213,7 +2213,7 @@ LRESULT TSAPI GetSendButtonState(HWND hwnd)
 	HWND hwndIDok=GetDlgItem(hwnd, IDOK);

 

 	if(hwndIDok)

-		return(SendMessage(hwndIDok, BUTTONSETASFLATBTN + 15, 0, 0));

+		return(SendMessage(hwndIDok, BUTTONGETSTATEID, TRUE, 0));

 	else

 		return 0;

 }

@@ -2221,13 +2221,13 @@ LRESULT TSAPI GetSendButtonState(HWND hwnd)
 void TSAPI EnableSendButton(const TWindowData *dat, int iMode)

 {

 	HWND hwndOK;

-	SendMessage(GetDlgItem(dat->hwnd, IDOK), BUTTONSETASFLATBTN + 14, iMode, 0);

-	SendMessage(GetDlgItem(dat->hwnd, IDC_PIC), BUTTONSETASFLATBTN + 14, dat->fEditNotesActive ? TRUE : (!iMode && dat->iOpenJobs == 0) ? TRUE : FALSE, 0);

+	SendMessage(GetDlgItem(dat->hwnd, IDOK), BUTTONSETASNORMAL, iMode, 0);

+	SendMessage(GetDlgItem(dat->hwnd, IDC_PIC), BUTTONSETASNORMAL, dat->fEditNotesActive ? TRUE : (!iMode && dat->iOpenJobs == 0) ? TRUE : FALSE, 0);

 

 	hwndOK = GetDlgItem(GetParent(GetParent(dat->hwnd)), IDOK);

 

 	if (IsWindow(hwndOK))

-		SendMessage(hwndOK, BUTTONSETASFLATBTN + 14, iMode, 0);

+		SendMessage(hwndOK, BUTTONSETASNORMAL, iMode, 0);

 }

 

 void TSAPI SendNudge(const TWindowData *dat)

diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp
index d5e2e86cdd..481e00f171 100644
--- a/plugins/TabSRMM/src/sidebar.cpp
+++ b/plugins/TabSRMM/src/sidebar.cpp
@@ -110,10 +110,10 @@ void CSideBarButton::_create()
 							  0, 0, 40, 40, m_sideBar->getScrollWnd(), reinterpret_cast<HMENU>(m_id), g_hInst, NULL);

 

 	if(m_hwnd) {

-		::SendMessage(m_hwnd, BUTTONSETASSIDEBARBUTTON, 0, (LPARAM)this);

-		::SendMessage(m_hwnd, BUTTONSETASFLATBTN, 1,  1);

-		::SendMessage(m_hwnd, BUTTONSETASFLATBTN + 10, 1,  1);

-		::SendMessage(m_hwnd, BUTTONSETASFLATBTN + 12, 0, (LPARAM)m_sideBar->getContainer());

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

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

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

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

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

 	}

 	else