From 6dfdffd3161a716304b74c1fc5c386c9601cc69e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 29 Nov 2016 13:25:28 +0300 Subject: - BBBF_ISLSIDEBUTTON flag removed (set by default); - m_bLSided removed, because it's mutually exclusive with m_bRSided --- plugins/Actman/ua/i_uaplaces.inc | 6 +-- plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc | 1 - plugins/ExternalAPI/m_msg_buttonsbar.h | 1 - plugins/FTPFileYM/src/ftpfile.cpp | 2 +- plugins/MenuItemEx/src/main.cpp | 2 +- plugins/MirLua/src/m_database.cpp | 4 +- plugins/MirLua/src/m_message.cpp | 2 +- plugins/Nudge/src/main.cpp | 2 +- plugins/PasteIt/src/PasteIt.cpp | 2 +- plugins/QuickMessages/src/Utils.cpp | 4 +- plugins/QuickReplies/src/events.cpp | 2 +- plugins/TabSRMM/src/buttonsbar.cpp | 57 +++++++++++-------------- plugins/TabSRMM/src/modplus.cpp | 2 +- 13 files changed, 37 insertions(+), 50 deletions(-) (limited to 'plugins') diff --git a/plugins/Actman/ua/i_uaplaces.inc b/plugins/Actman/ua/i_uaplaces.inc index f01c800066..c5ac67c4db 100644 --- a/plugins/Actman/ua/i_uaplaces.inc +++ b/plugins/Actman/ua/i_uaplaces.inc @@ -738,11 +738,9 @@ begin tabb.iButtonWidth :=0; tabb.hIcon :=ActionItem.hIcolibIcon; if (ActionItem.flags and UAF_2STATE)<>0 then - tabb.bbbFlags:=BBBF_ISIMBUTTON or BBBF_ISLSIDEBUTTON or - BBBF_ISCHATBUTTON or BBBF_ISPUSHBUTTON + tabb.bbbFlags:=BBBF_ISIMBUTTON or BBBF_ISCHATBUTTON or BBBF_ISPUSHBUTTON else - tabb.bbbFlags:=BBBF_ISIMBUTTON or BBBF_ISLSIDEBUTTON or - BBBF_ISCHATBUTTON; + tabb.bbbFlags:=BBBF_ISIMBUTTON or BBBF_ISCHATBUTTON; if ActionItem.szTabBTooltip<>nil then tabb.szTooltip:=ActionItem.szTabBTooltip diff --git a/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc b/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc index e93e5cb5bd..9caa4dc44a 100644 --- a/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc +++ b/plugins/ExternalAPI/delphi/m_msg_buttonsbar.inc @@ -92,7 +92,6 @@ const BBBF_ISARROWBUTTON = $0008; BBBF_ISCHATBUTTON = $0010; BBBF_ISIMBUTTON = $0020; - BBBF_ISLSIDEBUTTON = $0040; BBBF_ISRSIDEBUTTON = $0080; BBBF_CANBEHIDDEN = $0100; BBBF_ISDUMMYBUTTON = $0200; diff --git a/plugins/ExternalAPI/m_msg_buttonsbar.h b/plugins/ExternalAPI/m_msg_buttonsbar.h index c005b46a2f..b2eb25ef52 100644 --- a/plugins/ExternalAPI/m_msg_buttonsbar.h +++ b/plugins/ExternalAPI/m_msg_buttonsbar.h @@ -95,7 +95,6 @@ typedef struct { #define BBBF_ISARROWBUTTON (1<<3) #define BBBF_ISCHATBUTTON (1<<4) #define BBBF_ISIMBUTTON (1<<5) -#define BBBF_ISLSIDEBUTTON (1<<6) #define BBBF_ISRSIDEBUTTON (1<<7) #define BBBF_CANBEHIDDEN (1<<8) #define BBBF_ISDUMMYBUTTON (1<<9) diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 569414b49b..143108bf41 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -188,7 +188,7 @@ void InitTabsrmmButton() btn.pszModuleName = MODULE; btn.dwDefPos = 105; btn.hIcon = iconList[ServerList::FTP_COUNT].hIcolib; - btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN; + btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_CANBEHIDDEN; btn.pwszTooltip = TranslateT("FTP File"); CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&btn); HookEvent(ME_MSG_BUTTONPRESSED, TabsrmmButtonPressed); diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index fb1f8e8560..79611ab50e 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -901,7 +901,7 @@ static int TabsrmmButtonsInit(WPARAM, LPARAM) bbd.dwButtonID = 0; bbd.dwDefPos = 1000; bbd.pwszTooltip = LPGENW("Browse Received Files"); - bbd.bbbFlags = BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN; + bbd.bbbFlags = BBBF_CANBEHIDDEN; bbd.hIcon = IcoLib_GetIconHandle("miex_recfiles"); CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&bbd); diff --git a/plugins/MirLua/src/m_database.cpp b/plugins/MirLua/src/m_database.cpp index b50f2d80a9..7a916f63d2 100644 --- a/plugins/MirLua/src/m_database.cpp +++ b/plugins/MirLua/src/m_database.cpp @@ -297,7 +297,7 @@ void MakeDbEvent(lua_State *L, DBEVENTINFO &dbei) switch (lua_type(L, -1)) { case LUA_TTABLE: - dbei.cbBlob = lua_rawlen(L, 4); + dbei.cbBlob = (DWORD)lua_rawlen(L, 4); dbei.pBlob = (BYTE*)mir_calloc(dbei.cbBlob); for (DWORD i = 0; i < dbei.cbBlob; i++) { @@ -309,7 +309,7 @@ void MakeDbEvent(lua_State *L, DBEVENTINFO &dbei) case LUA_TSTRING: size_t nLen; const char *str = lua_tolstring(L, -1, &nLen); - dbei.cbBlob = nLen; + dbei.cbBlob = (DWORD)nLen; dbei.pBlob = (BYTE*)mir_alloc(nLen); memcpy(dbei.pBlob, str, nLen); break; diff --git a/plugins/MirLua/src/m_message.cpp b/plugins/MirLua/src/m_message.cpp index d08fad864b..cf13c1ff35 100644 --- a/plugins/MirLua/src/m_message.cpp +++ b/plugins/MirLua/src/m_message.cpp @@ -46,7 +46,7 @@ static int message_Send(lua_State *L) dbei.szModule = MODULE; dbei.timestamp = time(NULL); dbei.eventType = EVENTTYPE_MESSAGE; - dbei.cbBlob = mir_strlen(message); + dbei.cbBlob = (DWORD)mir_strlen(message); dbei.pBlob = (PBYTE)mir_strdup(message); dbei.flags = DBEF_UTF | DBEF_SENT; db_event_add(hContact, &dbei); diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index 2ca21f19b0..c159a76aec 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -252,7 +252,7 @@ static int TabsrmmButtonInit(WPARAM, LPARAM) bbd.pszModuleName = "Nudge"; bbd.pwszTooltip = LPGENW("Send Nudge"); bbd.dwDefPos = 300; - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_CANBEHIDDEN; bbd.hIcon = iconList[0].hIcolib; bbd.dwButtonID = 6000; bbd.iButtonWidth = 0; diff --git a/plugins/PasteIt/src/PasteIt.cpp b/plugins/PasteIt/src/PasteIt.cpp index 9ba068870b..eb34cf7634 100644 --- a/plugins/PasteIt/src/PasteIt.cpp +++ b/plugins/PasteIt/src/PasteIt.cpp @@ -344,7 +344,7 @@ void InitTabsrmmButton() btn.pszModuleName = MODULE; btn.dwDefPos = 110; btn.hIcon = icon.hIcolib; - btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CANBEHIDDEN | BBBF_ISCHATBUTTON; + btn.bbbFlags = BBBF_ISARROWBUTTON | BBBF_ISIMBUTTON | BBBF_CANBEHIDDEN | BBBF_ISCHATBUTTON; btn.pwszTooltip = TranslateT("Paste It"); CallService(MS_BB_ADDBUTTON, 0, (LPARAM)&btn); diff --git a/plugins/QuickMessages/src/Utils.cpp b/plugins/QuickMessages/src/Utils.cpp index d1d481d4df..e7eb41f334 100644 --- a/plugins/QuickMessages/src/Utils.cpp +++ b/plugins/QuickMessages/src/Utils.cpp @@ -252,7 +252,7 @@ DWORD BalanceButtons(int buttonsWas, int buttonsNow) if (ServiceExists(MS_BB_ADDBUTTON)) { char iconname[40]; mir_snprintf(iconname, LPGEN("Quick Messages Button %u"), buttonsWas); - bb.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON; + bb.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON; bb.dwButtonID = buttonsWas++; bb.dwDefPos = 300 + buttonsWas; bb.hIcon = AddIcon(iconname); @@ -376,7 +376,7 @@ int RegisterCustomButton(WPARAM, LPARAM) mir_snprintf(iconname, LPGEN("Quick Messages Button %u"), i); BBButton bbd = { sizeof(bbd) }; - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON; bbd.dwButtonID = i; bbd.dwDefPos = 320 + i; bbd.hIcon = AddIcon(iconname); diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index fb26bef2a6..1839bc891a 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -57,7 +57,7 @@ int OnModulesLoaded(WPARAM, LPARAM) BBButton bbd = {0}; bbd.cbSize = sizeof(BBButton); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON; bbd.pszModuleName = buttonName; bbd.pwszTooltip = LPGENW("Quick Replies\r\nLeft button - open menu\r\nRight button - options page"); bbd.hIcon = icon.hIcolib; diff --git a/plugins/TabSRMM/src/buttonsbar.cpp b/plugins/TabSRMM/src/buttonsbar.cpp index a87bca2694..41848e6e52 100644 --- a/plugins/TabSRMM/src/buttonsbar.cpp +++ b/plugins/TabSRMM/src/buttonsbar.cpp @@ -28,7 +28,7 @@ struct CustomButtonData : public MZeroedObject bool m_bIMButton, m_bChatButton; bool m_bCanBeHidden, m_bHidden, m_bAutoHidden, m_bSeparator, m_bDisabled, m_bPushButton; - bool m_bLSided, m_bRSided; + bool m_bRSided; BYTE m_opFlags; }; @@ -73,7 +73,6 @@ static void CB_GetButtonSettings(MCONTACT hContact, CustomButtonData *cbd) token = strtok(NULL, "_"); cbd->m_bChatButton = atoi(token) != 0; token = strtok(NULL, "_"); - cbd->m_bLSided = atoi(token) != 0; token = strtok(NULL, "_"); cbd->m_bRSided = atoi(token) != 0; token = strtok(NULL, "_"); @@ -122,7 +121,6 @@ static INT_PTR CB_AddButton(WPARAM, LPARAM lParam) // ugly workaround for smileys plugins cbd->m_dwArrowCID = (bbdi->bbbFlags & BBBF_ISARROWBUTTON) ? (cbd->m_dwButtonCID == IDOK ? IDC_SENDMENU : (cbd->m_dwButtonCID + 1)) : 0; cbd->m_bHidden = (bbdi->bbbFlags & BBBF_HIDDEN) != 0; - cbd->m_bLSided = (bbdi->bbbFlags & BBBF_ISLSIDEBUTTON) != 0; cbd->m_bRSided = (bbdi->bbbFlags & BBBF_ISRSIDEBUTTON) != 0; cbd->m_bCanBeHidden = (bbdi->bbbFlags & BBBF_CANBEHIDDEN) != 0; cbd->m_bSeparator = (bbdi->bbbFlags & BBBF_ISDUMMYBUTTON) != 0; @@ -133,14 +131,10 @@ static INT_PTR CB_AddButton(WPARAM, LPARAM lParam) CB_GetButtonSettings(NULL, cbd); - if (cbd->m_bLSided) - LButtonsList.insert(cbd); - else if (cbd->m_bRSided) + if (cbd->m_bRSided) RButtonsList.insert(cbd); - else { - delete cbd; - return 1; - } + else + LButtonsList.insert(cbd); if (cbd->m_dwButtonCID != cbd->m_dwButtonOrigID) LastCID++; @@ -263,7 +257,7 @@ static INT_PTR CB_RemoveButton(WPARAM, LPARAM lParam) } if (pFound) { - M.BroadcastMessage(DM_CBDESTROY, pFound->m_dwButtonCID, pFound->m_bLSided ? BBBF_ISLSIDEBUTTON : BBBF_ISRSIDEBUTTON); + M.BroadcastMessage(DM_CBDESTROY, pFound->m_dwButtonCID, pFound->m_bRSided ? BBBF_ISRSIDEBUTTON : ~BBBF_ISRSIDEBUTTON); delete pFound; } return 0; @@ -305,7 +299,6 @@ static INT_PTR CB_ModifyButton(WPARAM, LPARAM lParam) cbd->m_hIcon = bbdi->hIcon; if (bbdi->bbbFlags) { cbd->m_bHidden = (bbdi->bbbFlags & BBBF_HIDDEN) != 0; - cbd->m_bLSided = (bbdi->bbbFlags & BBBF_ISLSIDEBUTTON) != 0; cbd->m_bRSided = (bbdi->bbbFlags & BBBF_ISRSIDEBUTTON) != 0; cbd->m_bCanBeHidden = (bbdi->bbbFlags & BBBF_CANBEHIDDEN) != 0; cbd->m_bChatButton = (bbdi->bbbFlags & BBBF_ISCHATBUTTON) != 0; @@ -327,7 +320,7 @@ static void BB_RegisterSeparators() bbd.cbSize = sizeof(BBButton); bbd.pszModuleName = "Tabsrmm_sep"; for (; dwSepCount > i; i++) { - bbd.bbbFlags = BBBF_ISDUMMYBUTTON | BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON; + bbd.bbbFlags = BBBF_ISDUMMYBUTTON | BBBF_ISIMBUTTON; bbd.dwButtonID = i + 1; bbd.dwDefPos = 410 + i; CB_AddButton(0, (LPARAM)&bbd); @@ -367,13 +360,11 @@ static int SaveTree(HWND hToolBarTree) cbd->m_bChatButton = (cbd->m_opFlags & BBSF_CHATBUTTON) != 0; cbd->m_bCanBeHidden = (cbd->m_opFlags & BBSF_CANBEHIDDEN) != 0; } - if (RSide && cbd->m_bLSided) { - cbd->m_bLSided = false; + if (RSide && !cbd->m_bRSided) { cbd->m_bRSided = true; cbd->m_opFlags |= BBSF_NTBSWAPED; } else if (!RSide && cbd->m_bRSided) { - cbd->m_bLSided = true; cbd->m_bRSided = false; cbd->m_opFlags |= BBSF_NTBSWAPED; } @@ -607,7 +598,7 @@ INT_PTR CALLBACK DlgProcToolBar(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l hItem = TVI_FIRST; CustomButtonData *cbd = new CustomButtonData(); - cbd->m_bSeparator = cbd->m_bHidden = cbd->m_bIMButton = cbd->m_bLSided = true; + cbd->m_bSeparator = cbd->m_bHidden = cbd->m_bIMButton = true; cbd->m_dwButtonOrigID = ++dwSepCount; cbd->m_pszModuleName = "Tabsrmm_sep"; cbd->m_iButtonWidth = 22; @@ -809,7 +800,7 @@ void CB_WriteButtonSettings(MCONTACT hContact, CustomButtonData *cbd) //modulename_buttonID, position_inIM_inCHAT_isLSide_isRSide_CanBeHidden mir_snprintf(SettingName, "%s_%d", cbd->m_pszModuleName, cbd->m_dwButtonOrigID); - mir_snprintf(SettingParameter, "%d_%u_%u_%u_%u_%u", cbd->m_dwPosition, cbd->m_bIMButton, cbd->m_bChatButton, cbd->m_bLSided, cbd->m_bRSided, cbd->m_bCanBeHidden); + mir_snprintf(SettingParameter, "%d_%u_%u_%u_%u_%u", cbd->m_dwPosition, cbd->m_bIMButton, cbd->m_bChatButton, 0, cbd->m_bRSided, cbd->m_bCanBeHidden); if (!(cbd->m_opFlags & BBSF_NTBDESTRUCT)) db_set_s(hContact, "TabSRMM_Toolbar", SettingName, SettingParameter); else @@ -820,7 +811,7 @@ void CB_InitDefaultButtons() { BBButton bbd = { 0 }; bbd.cbSize = sizeof(BBButton); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID; bbd.dwButtonID = IDC_PROTOCOL; bbd.dwDefPos = 10; bbd.hIcon = Skin_GetIconHandle(SKINICON_OTHER_CONNECTING); @@ -828,7 +819,7 @@ void CB_InitDefaultButtons() bbd.pwszTooltip = LPGENW("Protocol button"); CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISARROWBUTTON | BBBF_CREATEBYID; bbd.dwButtonID = IDC_NAME; bbd.dwDefPos = 20; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[20]; @@ -836,7 +827,7 @@ void CB_InitDefaultButtons() CB_AddButton(0, (LPARAM)&bbd); if (PluginConfig.g_SmileyAddAvail) { - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_CREATEBYID; bbd.dwButtonID = IDC_SMILEYBTN; bbd.iButtonWidth = 0; bbd.dwDefPos = 30; @@ -845,28 +836,28 @@ void CB_InitDefaultButtons() CB_AddButton(0, (LPARAM)&bbd); } - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; bbd.dwButtonID = IDC_FONTBOLD; bbd.dwDefPos = 40; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[10]; bbd.pwszTooltip = LPGENW("Bold text"); CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; bbd.dwButtonID = IDC_FONTITALIC; bbd.dwDefPos = 50; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[11]; bbd.pwszTooltip = LPGENW("Italic text"); CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; bbd.dwButtonID = IDC_FONTUNDERLINE; bbd.dwDefPos = 60; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[12]; bbd.pwszTooltip = LPGENW("Underlined text"); CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON | BBBF_CANBEHIDDEN | BBBF_CREATEBYID; bbd.dwButtonID = IDC_FONTSTRIKEOUT; bbd.dwDefPos = 70; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[15]; @@ -922,7 +913,7 @@ void CB_InitDefaultButtons() CB_AddButton(0, (LPARAM)&bbd); // chat buttons - bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON; + bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISDUMMYBUTTON; bbd.dwButtonID = 1; bbd.pszModuleName = "tb_splitter"; bbd.dwDefPos = 31; @@ -931,17 +922,17 @@ void CB_InitDefaultButtons() bbd.pwszTooltip = 0; CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON; + bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISDUMMYBUTTON; bbd.dwButtonID = 2; bbd.dwDefPos = 22; CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISDUMMYBUTTON; + bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISDUMMYBUTTON; bbd.dwButtonID = 3; bbd.dwDefPos = 71; CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID; bbd.dwButtonID = IDC_COLOR; bbd.pszModuleName = "Tabsrmm"; bbd.dwDefPos = 80; @@ -949,7 +940,7 @@ void CB_InitDefaultButtons() bbd.pwszTooltip = LPGENW("Select font color"); CB_AddButton(0, (LPARAM)&bbd); - bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID; + bbd.bbbFlags = BBBF_ISCHATBUTTON | BBBF_ISPUSHBUTTON | BBBF_CREATEBYID; bbd.dwButtonID = IDC_BKGCOLOR; bbd.dwDefPos = 81; bbd.iButtonWidth = 22; @@ -1363,10 +1354,10 @@ void CB_DestroyButton(HWND hwndDlg, TWindowData *dat, DWORD dwButtonCID, DWORD d RECT rc = { 0 }; GetClientRect(hwndBtn, &rc); - if (dwFlags & BBBF_ISLSIDEBUTTON) - dat->bbLSideWidth -= rc.right; - else if (dwFlags & BBBF_ISRSIDEBUTTON) + if (dwFlags & BBBF_ISRSIDEBUTTON) dat->bbRSideWidth -= rc.right; + else + dat->bbLSideWidth -= rc.right; DestroyWindow(hwndBtn); BB_SetButtonsPos(dat); diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index 4acddabb73..d58e9a3062 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -54,7 +54,7 @@ static int RegisterCustomButton(WPARAM, LPARAM) BBButton bbd = { 0 }; bbd.cbSize = sizeof(BBButton); - bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISLSIDEBUTTON | BBBF_ISPUSHBUTTON; + bbd.bbbFlags = BBBF_ISIMBUTTON | BBBF_ISPUSHBUTTON; bbd.dwButtonID = 1; bbd.dwDefPos = 200; bbd.hIcon = PluginConfig.g_buttonBarIconHandles[3]; -- cgit v1.2.3