summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_clc.h6
-rw-r--r--include/m_clistint.h2
-rw-r--r--include/m_gui.h9
-rw-r--r--libs/win32/mir_core.libbin465934 -> 463890 bytes
-rw-r--r--libs/win64/mir_core.libbin470858 -> 468772 bytes
-rw-r--r--plugins/Clist_modern/src/modern_clcpaint.cpp98
-rw-r--r--plugins/TipperYM/src/options.cpp2
-rw-r--r--protocols/Facebook/src/groupchats.cpp7
-rw-r--r--protocols/ICQ-WIM/src/groupchats.cpp7
-rw-r--r--protocols/JabberG/src/jabber_chat.cpp7
-rw-r--r--protocols/JabberG/src/jabber_privacy.cpp7
-rw-r--r--protocols/SkypeWeb/src/skype_dialogs.cpp7
-rw-r--r--protocols/VKontakte/src/vk_dialogs.cpp35
-rw-r--r--protocols/VKontakte/src/vk_dialogs.h4
-rw-r--r--src/mir_app/src/clcmsgs.cpp28
-rw-r--r--src/mir_core/src/CCtrlClc.cpp28
-rw-r--r--src/mir_core/src/mir_core.def7
-rw-r--r--src/mir_core/src/mir_core64.def7
18 files changed, 68 insertions, 193 deletions
diff --git a/include/m_clc.h b/include/m_clc.h
index 1fd2c1ad7f..c47a0ac84a 100644
--- a/include/m_clc.h
+++ b/include/m_clc.h
@@ -112,7 +112,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CLBF_TILEV 0x2000
#define CLBF_PROPORTIONAL 0x4000
#define CLBF_SCROLL 0x8000
-#define CLM_SETBKBITMAP (CLM_FIRST+27) //wParam = mode, lParam = hBitmap (don't delete it), NULL for none
+
#define CLM_SETBKCOLOR (CLM_FIRST+28) //wParam = a COLORREF, default is GetSysColor(COLOR_3DFACE)
#define CLM_SETCHECKMARK (CLM_FIRST+29) //wParam = hItem, lParam = 1 or 0
#define CLM_SETEXTRACOLUMNS (CLM_FIRST+30) //wParam = number of extra columns (zero to EXTRA_ICON_COUNT from clc.h, currently 16)
@@ -133,7 +133,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define FONTID_MAX 18
#define CLM_SETFONT (CLM_FIRST+33) //wParam = hFont, lParam = MAKELPARAM(fRedraw,fontId)
-#define CLM_SETINDENT (CLM_FIRST+34) //wParam = new indent, default is 3 pixels
#define CLM_SETITEMTEXT (CLM_FIRST+35) //wParam = hItem, lParam = (char*)pszNewText
#define CLM_SETSCROLLTIME (CLM_FIRST+36) //wParam = time in ms, default 200
@@ -148,8 +147,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CLM_SETOFFLINEMODES (CLM_FIRST+43) //for 'hide offline', wParam = PF2_ flags and MODEF_OFFLINE
#define CLM_GETEXSTYLE (CLM_FIRST+44) //returns CLS_EX_ flags
#define CLM_SETEXSTYLE (CLM_FIRST+45) //wParam = CLS_EX_ flags
-#define CLM_GETLEFTMARGIN (CLM_FIRST+46) //returns count of pixels
-#define CLM_SETLEFTMARGIN (CLM_FIRST+47) //wParam = pixels
+
typedef struct {
int cbSize;
const wchar_t *pszText;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 1f11f2f292..592174e550 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -218,7 +218,7 @@ struct MenuProto
#define DROPTARGET_INSERTION 5
#define CLCDEFAULT_ROWHEIGHT 16
-#define CLCDEFAULT_EXSTYLE (CLS_EX_EDITLABELS|CLS_EX_TRACKSELECT|CLS_EX_SHOWGROUPCOUNTS|CLS_EX_HIDECOUNTSWHENEMPTY|CLS_EX_TRACKSELECT|CLS_EX_NOTRANSLUCENTSEL) //plus CLS_EX_NOSMOOTHSCROLL is got from the system
+#define CLCDEFAULT_EXSTYLE (CLS_EX_EDITLABELS|CLS_EX_TRACKSELECT|CLS_EX_SHOWGROUPCOUNTS|CLS_EX_HIDECOUNTSWHENEMPTY|CLS_EX_TRACKSELECT|CLS_EX_NOTRANSLUCENTSEL)
#define CLCDEFAULT_SCROLLTIME 150
#define CLCDEFAULT_GROUPINDENT 5
#define CLCDEFAULT_BKCOLOUR GetSysColor(COLOR_3DFACE)
diff --git a/include/m_gui.h b/include/m_gui.h
index 7234e37ebb..6b13667a83 100644
--- a/include/m_gui.h
+++ b/include/m_gui.h
@@ -727,31 +727,24 @@ public:
HANDLE GetSelection();
HANDLE HitTest(int x, int y, DWORD *hitTest);
void SelectItem(HANDLE hItem);
- void SetBkBitmap(DWORD mode, HBITMAP hBitmap);
void SetBkColor(COLORREF clBack);
void SetCheck(HANDLE hItem, bool check);
void SetExtraColumns(int iColumns);
void SetExtraImage(HANDLE hItem, int iColumn, int iImage);
void SetExtraImageList(HIMAGELIST hImgList);
void SetFont(int iFontId, HANDLE hFont, bool bRedraw);
- void SetIndent(int iIndent);
void SetItemText(HANDLE hItem, char *szText);
void SetHideEmptyGroups(bool state);
- void SetGreyoutFlags(DWORD flags);
bool GetHideOfflineRoot();
void SetHideOfflineRoot(bool state);
void SetUseGroups(bool state);
void SetOfflineModes(DWORD modes);
DWORD GetExStyle();
void SetExStyle(DWORD exStyle);
- int GetLefrMargin();
- void SetLeftMargin(int iMargin);
HANDLE AddInfoItem(CLCINFOITEM *cii);
int GetItemType(HANDLE hItem);
HANDLE GetNextItem(HANDLE hItem, DWORD flags);
- COLORREF GetTextColor(int iFontId);
- void SetTextColor(int iFontId, COLORREF clText);
-
+
struct TEventInfo
{
CCtrlClc *ctrl;
diff --git a/libs/win32/mir_core.lib b/libs/win32/mir_core.lib
index 343ce469b6..b63361053a 100644
--- a/libs/win32/mir_core.lib
+++ b/libs/win32/mir_core.lib
Binary files differ
diff --git a/libs/win64/mir_core.lib b/libs/win64/mir_core.lib
index ac36f200a1..d84d42a5f8 100644
--- a/libs/win64/mir_core.lib
+++ b/libs/win64/mir_core.lib
Binary files differ
diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 000c0300f2..92752f48d4 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -231,7 +231,7 @@ void CLCPaint::GetTextSize(SIZE *text_size, HDC hdcMem, RECT free_row_rc, wchar_
}
}
-void CLCPaint::AddParam(MODERNMASK *mpModernMask, DWORD dwParamHash, const char* const szValue, DWORD dwValueHash)
+void CLCPaint::AddParam(MODERNMASK *mpModernMask, DWORD dwParamHash, const char *const szValue, DWORD dwValueHash)
{
static MASKPARAM param = { 0 }; //AddParameter will clear it so it can be static to avoid initializations
_FillParam(&param, dwParamHash, szValue, dwValueHash);
@@ -278,9 +278,9 @@ void CLCPaint::_SetHotTrackColour(HDC hdc, ClcData *dat)
}
else if (newLum <= oldLum) {
int r, g, b;
- r = GetRValue(dat->hotTextColour)*oldLum / newLum;
- g = GetGValue(dat->hotTextColour)*oldLum / newLum;
- b = GetBValue(dat->hotTextColour)*oldLum / newLum;
+ r = GetRValue(dat->hotTextColour) * oldLum / newLum;
+ g = GetGValue(dat->hotTextColour) * oldLum / newLum;
+ b = GetBValue(dat->hotTextColour) * oldLum / newLum;
if (r > 255) {
g += (r - 255) * 3 / 7;
b += (r - 255) * 3 / 7;
@@ -346,7 +346,7 @@ RECT CLCPaint::_GetRectangle(ClcData *dat, RECT *row_rc, RECT *free_row_rc, int
-void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, wchar_t *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley)
+void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE *text_size, wchar_t *szText, int start, int len, SortedList *plText, UINT uTextFormat, BOOL ResizeSizeSmiley)
{
if (szText == nullptr)
return;
@@ -446,7 +446,7 @@ void CLCPaint::_DrawTextSmiley(HDC hdcMem, RECT *free_rc, SIZE * text_size, wcha
}
-void CLCPaint::_AddParameter(MODERNMASK *mpModernMask, MASKPARAM * lpParam)
+void CLCPaint::_AddParameter(MODERNMASK *mpModernMask, MASKPARAM *lpParam)
{
mpModernMask->pl_Params = (MASKPARAM *)mir_realloc(mpModernMask->pl_Params, (mpModernMask->dwParamCnt + 1)*sizeof(MASKPARAM));
memmove(&(mpModernMask->pl_Params[mpModernMask->dwParamCnt]), lpParam, sizeof(MASKPARAM));
@@ -454,7 +454,7 @@ void CLCPaint::_AddParameter(MODERNMASK *mpModernMask, MASKPARAM * lpParam)
memset(lpParam, 0, sizeof(MASKPARAM));
}
-void CLCPaint::_FillParam(MASKPARAM *lpParam, DWORD dwParamHash, const char* const szValue, DWORD dwValueHash)
+void CLCPaint::_FillParam(MASKPARAM *lpParam, DWORD dwParamHash, const char *const szValue, DWORD dwValueHash)
{
lpParam->bMaskParamFlag = MPF_EQUAL | MPF_HASHED;
lpParam->dwId = dwParamHash;
@@ -528,7 +528,7 @@ MODERNMASK* CLCPaint::_GetCLCContactRowBackModernMask(ClcGroup *group, ClcContac
case ID_STATUS_IDLE: _AddParamShort(mpModernMask, hi_Status, hi_IDLE); break;
default: _AddParamShort(mpModernMask, hi_Status, hi_OFFLINE);
}
- _AddParamShort(mpModernMask, hi_HasAvatar, (dat->avatars_show && Drawing->avatar_data != nullptr) ? hi_True : hi_False);
+ _AddParamShort(mpModernMask, hi_HasAvatar, (dat->avatars_show && Drawing->avatar_data != nullptr) ? hi_True : hi_False);
_AddParamShort(mpModernMask, hi_Rate, hi_None + Drawing->bContactRate);
}
break;
@@ -601,7 +601,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
// TO DO DEPRECATE OLD ROW LAYOUT
- if (Drawing->type == CLCIT_GROUP &&
+ if (Drawing->type == CLCIT_GROUP &&
Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl[0] != Drawing) {
dg = dat->row_before_group_space;
@@ -686,7 +686,7 @@ void CLCPaint::_PaintRowItemsEx(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
mode = BlendedInActiveState ? ILD_NORMAL : ILD_FOCUS;
colourFg = dat->hotTextColour;
}
- else if (Drawing->type == CLCIT_CONTACT && Drawing->flags&CONTACTF_NOTONLIST) {
+ else if (Drawing->type == CLCIT_CONTACT && Drawing->flags & CONTACTF_NOTONLIST) {
colourFg = dat->fontModernInfo[FONTID_NOTONLIST].colour;
mode = BlendValue;
}
@@ -924,21 +924,21 @@ BOOL CLCPaint::_DrawNonEnginedBackground(HDC hdcMem, RECT *rcPaint, RECT clRect,
GetObject(dat->hBmpBackground, sizeof(bmp), &bmp);
HDC hdcBmp = CreateCompatibleDC(hdcMem);
HBITMAP oldbm = (HBITMAP)SelectObject(hdcBmp, dat->hBmpBackground);
- int x, y = dat->backgroundBmpUse&CLBF_SCROLL ? -dat->yScroll : 0;
- int maxx = dat->backgroundBmpUse&CLBF_TILEH ? clRect.right : 1;
- int maxy = dat->backgroundBmpUse&CLBF_TILEV ? rcPaint->bottom : y + 1;
+ int x, y = dat->backgroundBmpUse & CLBF_SCROLL ? -dat->yScroll : 0;
+ int maxx = dat->backgroundBmpUse & CLBF_TILEH ? clRect.right : 1;
+ int maxy = dat->backgroundBmpUse & CLBF_TILEV ? rcPaint->bottom : y + 1;
int destw, desth;
- switch (dat->backgroundBmpUse&CLBM_TYPE) {
+ switch (dat->backgroundBmpUse & CLBM_TYPE) {
case CLB_STRETCH:
- if (dat->backgroundBmpUse&CLBF_PROPORTIONAL) {
- if (clRect.right*bmp.bmHeight < clRect.bottom*bmp.bmWidth) {
+ if (dat->backgroundBmpUse & CLBF_PROPORTIONAL) {
+ if (clRect.right * bmp.bmHeight < clRect.bottom * bmp.bmWidth) {
desth = clRect.bottom;
- destw = desth*bmp.bmWidth / bmp.bmHeight;
+ destw = desth * bmp.bmWidth / bmp.bmHeight;
}
else {
destw = clRect.right;
- desth = destw*bmp.bmHeight / bmp.bmWidth;
+ desth = destw * bmp.bmHeight / bmp.bmWidth;
}
}
else {
@@ -948,9 +948,9 @@ BOOL CLCPaint::_DrawNonEnginedBackground(HDC hdcMem, RECT *rcPaint, RECT clRect,
break;
case CLB_STRETCHH:
- if (dat->backgroundBmpUse&CLBF_PROPORTIONAL) {
+ if (dat->backgroundBmpUse & CLBF_PROPORTIONAL) {
destw = clRect.right;
- desth = destw*bmp.bmHeight / bmp.bmWidth;
+ desth = destw * bmp.bmHeight / bmp.bmWidth;
}
else {
destw = clRect.right;
@@ -961,9 +961,9 @@ BOOL CLCPaint::_DrawNonEnginedBackground(HDC hdcMem, RECT *rcPaint, RECT clRect,
break;
case CLB_STRETCHV:
- if (dat->backgroundBmpUse&CLBF_PROPORTIONAL) {
+ if (dat->backgroundBmpUse & CLBF_PROPORTIONAL) {
desth = clRect.bottom;
- destw = desth*bmp.bmWidth / bmp.bmHeight;
+ destw = desth * bmp.bmWidth / bmp.bmHeight;
}
else {
destw = bmp.bmWidth;
@@ -974,7 +974,7 @@ BOOL CLCPaint::_DrawNonEnginedBackground(HDC hdcMem, RECT *rcPaint, RECT clRect,
default: //clb_topleft
destw = bmp.bmWidth;
desth = bmp.bmHeight;
- if (dat->backgroundBmpUse&CLBF_TILEVTOROWHEIGHT)
+ if (dat->backgroundBmpUse & CLBF_TILEVTOROWHEIGHT)
desth = dat->row_min_heigh;
break;
}
@@ -1000,7 +1000,7 @@ int CLCPaint::_DetermineDrawMode(HWND hWnd, ClcData *dat)
else if (!g_CluiData.fLayered)
paintMode = DM_NON_LAYERED;
- if (!(paintMode&DM_CONTROL) && !CLUI_IsInMainWindow(hWnd))
+ if (!(paintMode & DM_CONTROL) && !CLUI_IsInMainWindow(hWnd))
paintMode |= DM_FLOAT;
int nStatus = Clist_GetGeneralizedStatus();
@@ -1008,7 +1008,7 @@ int CLCPaint::_DetermineDrawMode(HWND hWnd, ClcData *dat)
if ((lStyle & WS_DISABLED) || (dat->greyoutFlags & Clist_ClcStatusToPf2(nStatus)) || ((dat->greyoutFlags & GREYF_UNFOCUS) && (GetFocus() != hWnd)))
paintMode |= DM_GRAY;
- if (lStyle&CLS_GREYALTERNATE)
+ if (lStyle & CLS_GREYALTERNATE)
paintMode |= DM_GREYALTERNATE;
return paintMode;
@@ -1141,7 +1141,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
RowHeight_CalcRowHeight(dat, Drawing, line_num);
// Init settings
- int selected = ((line_num == dat->selection) && (dat->hwndRenameEdit != nullptr || dat->bShowSelAlways || dat->exStyle&CLS_EX_SHOWSELALWAYS || is_foreground) && Drawing->type != CLCIT_DIVIDER);
+ int selected = ((line_num == dat->selection) && (dat->hwndRenameEdit != nullptr || dat->bShowSelAlways || dat->exStyle & CLS_EX_SHOWSELALWAYS || is_foreground) && Drawing->type != CLCIT_DIVIDER);
int hottrack = dat->exStyle & CLS_EX_TRACKSELECT && Drawing->type != CLCIT_DIVIDER && dat->iHotTrack == line_num;
int left_pos = clRect.left + dat->leftMargin + indent * dat->groupIndent + subident;
int right_pos = dat->rightMargin; // Border
@@ -1194,7 +1194,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
}
if (selected || hottrack) {
RECT mrc = row_rc;
- if (Drawing->type == CLCIT_GROUP &&
+ if (Drawing->type == CLCIT_GROUP &&
Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl[0] != Drawing) {
mrc.top += dat->row_before_group_space;
@@ -1227,7 +1227,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
min(y + row_height - i, max(dat->row_min_heigh, 1)), CLR_NONE, CLR_NONE,
dat->exStyle & CLS_EX_NOTRANSLUCENTSEL ? ILD_NORMAL : ILD_BLEND25);
}
- SetTextColor(pc.hdcMem, paintMode&DM_CONTROL ? GetSysColor(COLOR_HIGHLIGHTTEXT) : dat->selTextColour);
+ SetTextColor(pc.hdcMem, paintMode & DM_CONTROL ? GetSysColor(COLOR_HIGHLIGHTTEXT) : dat->selTextColour);
break;
case 2:
@@ -1271,7 +1271,7 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
mpRequest->pl_Params[1].dwValueHash = mod_CalcHash("Ovl");
RECT mrc = row_rc;
- if (Drawing->type == CLCIT_GROUP &&
+ if (Drawing->type == CLCIT_GROUP &&
Drawing->group->parent->groupId == 0 &&
Drawing->group->parent->cl[0] != Drawing) {
mrc.top += dat->row_before_group_space;
@@ -1313,21 +1313,21 @@ void CLCPaint::_DrawLines(HWND hWnd, ClcData *dat, int paintMode, RECT *rcPaint,
void CLCPaint::_DrawInsertionMark(ClcData *dat, RECT &clRect, _PaintContext &pc)
{
- int identation = dat->nInsertionLevel*dat->groupIndent;
+ int identation = dat->nInsertionLevel * dat->groupIndent;
int yt = cliGetRowTopY(dat, dat->iInsertionMark);
POINT pts[8];
pts[0].y = yt - dat->yScroll - 4;
if (pts[0].y < -3) pts[0].y = -3;
- pts[0].x = 1 + identation*(dat->text_rtl ? 0 : 1);
+ pts[0].x = 1 + identation * (dat->text_rtl ? 0 : 1);
pts[1].x = pts[0].x + 2;
pts[1].y = pts[0].y + 3;
- pts[2].x = clRect.right - identation*(dat->text_rtl ? 1 : 0) - 4;
+ pts[2].x = clRect.right - identation * (dat->text_rtl ? 1 : 0) - 4;
pts[2].y = pts[1].y;
- pts[3].x = clRect.right - 1 - identation*(dat->text_rtl ? 1 : 0);
+ pts[3].x = clRect.right - 1 - identation * (dat->text_rtl ? 1 : 0);
pts[3].y = pts[0].y - 1;
pts[4].x = pts[3].x; pts[4].y = pts[0].y + 7;
@@ -1351,7 +1351,7 @@ void CLCPaint::_CopyPaintToDest(HDC hdc, int paintMode, RECT *rcPaint, _PaintCon
if ((paintMode & DM_GRAY) && hdc && hdc != pc.hdcMem) {
BLENDFUNCTION bf = { AC_SRC_OVER, 0, 80, AC_SRC_ALPHA };
- BOOL a = ((paintMode&DM_GRAY) && ((paintMode&DM_NON_LAYERED)));
+ BOOL a = ((paintMode & DM_GRAY) && ((paintMode & DM_NON_LAYERED)));
ske_AlphaBlend(a ? pc.hdcMem2 : hdc, rcPaint->left, rcPaint->top, rcPaint->right - rcPaint->left, rcPaint->bottom - rcPaint->top, pc.hdcMem, rcPaint->left, rcPaint->top, rcPaint->right - rcPaint->left, rcPaint->bottom - rcPaint->top, bf);
if (a)
BitBlt(hdc, rcPaint->left, rcPaint->top, rcPaint->right - rcPaint->left, rcPaint->bottom - rcPaint->top, pc.hdcMem2, rcPaint->left, rcPaint->top, SRCCOPY);
@@ -1362,12 +1362,12 @@ void CLCPaint::_FreePaintContext(_PaintContext &pc)
{
if (pc.hBrushAlternateGrey) DeleteObject(pc.hBrushAlternateGrey);
SelectObject(pc.hdcMem, (HFONT)GetStockObject(DEFAULT_GUI_FONT));
- if (pc.fRelease&_PaintContext::release_hdcmem) {
+ if (pc.fRelease & _PaintContext::release_hdcmem) {
SelectObject(pc.hdcMem, pc.oldbmp);
DeleteObject(pc.hBmpOsb);
DeleteDC(pc.hdcMem);
}
- if (pc.fRelease&_PaintContext::release_hdcmem2) {
+ if (pc.fRelease & _PaintContext::release_hdcmem2) {
SelectObject(pc.hdcMem2, pc.oldbmp2);
DeleteObject(pc.hBmpOsb2);
DeleteDC(pc.hdcMem2);
@@ -1967,21 +1967,21 @@ BOOL CLCPaint::__IsVisible(RECT *firtRect, RECT *secondRect)
return !IsRectEmpty(&res);
}
-void CLCPaint::_GetBlendMode(IN ClcData *dat, IN ClcContact *Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF * OutColourFg, OUT int * OutMode)
+void CLCPaint::_GetBlendMode(IN ClcData *dat, IN ClcContact *Drawing, IN BOOL selected, IN BOOL hottrack, IN BOOL bFlag, OUT COLORREF *OutColourFg, OUT int *OutMode)
{
COLORREF colourFg;
int mode;
int BlendedInActiveState = (dat->dbbBlendInActiveState);
int BlendValue = dat->dbbBlend25 ? ILD_BLEND25 : ILD_BLEND50;
- if (selected && (bFlag&GIM_SELECTED_AFFECT)) {
+ if (selected && (bFlag & GIM_SELECTED_AFFECT)) {
colourFg = dat->selBkColour;
mode = BlendedInActiveState ? ILD_NORMAL : ILD_SELECTED;
}
- else if (hottrack && (bFlag&GIM_HOT_AFFECT)) {
+ else if (hottrack && (bFlag & GIM_HOT_AFFECT)) {
mode = BlendedInActiveState ? ILD_NORMAL : ILD_FOCUS;
colourFg = dat->hotTextColour;
}
- else if (Drawing->type == CLCIT_CONTACT && Drawing->flags&CONTACTF_NOTONLIST && (bFlag&GIM_TEMP_AFFECT)) {
+ else if (Drawing->type == CLCIT_CONTACT && Drawing->flags & CONTACTF_NOTONLIST && (bFlag & GIM_TEMP_AFFECT)) {
colourFg = dat->fontModernInfo[FONTID_NOTONLIST].colour;
mode = BlendValue;
}
@@ -1989,7 +1989,7 @@ void CLCPaint::_GetBlendMode(IN ClcData *dat, IN ClcContact *Drawing, IN BOOL se
colourFg = dat->selBkColour;
mode = ILD_NORMAL;
}
- if (Drawing->type == CLCIT_CONTACT && dat->bShowIdle && (Drawing->flags&CONTACTF_IDLE) &&
+ if (Drawing->type == CLCIT_CONTACT && dat->bShowIdle && (Drawing->flags & CONTACTF_IDLE) &&
Clist_GetRealStatus(Drawing, ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE &&
(bFlag & GIM_IDLE_AFFECT))
mode = ILD_SELECTED;
@@ -2107,7 +2107,7 @@ void CLCPaint::_DrawContactAvatar(HDC hdcMem, ClcData *dat, ClcContact *Drawing,
}
}
-void CLCPaint::_DrawContactIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *prcItem)
+void CLCPaint::_DrawContactIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int &selected, int &hottrack, RECT *prcItem)
{
// Draw Icon
int iImage = -1;
@@ -2128,7 +2128,7 @@ void CLCPaint::_DrawContactIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, i
}
}
-void CLCPaint::_DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat)
+void CLCPaint::_DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int &selected, int &hottrack, RECT &text_rc, RECT *prcItem, UINT uTextFormat)
{
ChangeToFont(hdcMem, dat, GetBasicFontID(Drawing), nullptr);
if (selected)
@@ -2169,7 +2169,7 @@ void CLCPaint::_DrawContactText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, i
text_rc.left = min(text_rc.left, prcItem->left);
}
-void CLCPaint::_DrawContactSubText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT& text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType)
+void CLCPaint::_DrawContactSubText(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int &selected, int &hottrack, RECT &text_rc, RECT *prcItem, UINT uTextFormat, BYTE itemType)
{
if (Drawing->type == CLCIT_GROUP) {
wchar_t *szCounts = Clist_GetGroupCountsText(dat, Drawing);
@@ -2218,7 +2218,7 @@ void CLCPaint::_DrawContactTime(HDC hdcMem, ClcData *dat, ClcContact *Drawing, R
}
}
-void CLCPaint::_DrawContactSelection(HDC hdcMem, ClcData *dat, int& selected, int& hottrack, RECT *rcPaint, RECT *prcItem)
+void CLCPaint::_DrawContactSelection(HDC hdcMem, ClcData *dat, int &selected, int &hottrack, RECT *rcPaint, RECT *prcItem)
{
// Selection background
if ((selected || hottrack) && dat->HiLightMode == 0) {
@@ -2229,7 +2229,7 @@ void CLCPaint::_DrawContactSelection(HDC hdcMem, ClcData *dat, int& selected, in
}
}
-void CLCPaint::_DrawContactExtraIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int& selected, int& hottrack, RECT *rc, int iImage)
+void CLCPaint::_DrawContactExtraIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawing, int &selected, int &hottrack, RECT *rc, int iImage)
{
//Draw extra icon
if (iImage != -1) {
@@ -2241,7 +2241,7 @@ void CLCPaint::_DrawContactExtraIcon(HDC hdcMem, ClcData *dat, ClcContact *Drawi
}
}
-void CLCPaint::_DrawContactLine(HDC hdcMem, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT& text_rc)
+void CLCPaint::_DrawContactLine(HDC hdcMem, ClcContact *Drawing, RECT *free_row_rc, RECT *rcPaint, RECT &text_rc)
{ //draw line
RECT rc1 = *free_row_rc;
RECT rc2 = *free_row_rc;
@@ -2320,13 +2320,13 @@ void CLCPaint::_DrawContactItems(HDC hdcMem, ClcData *dat, ClcContact *Drawing,
_DrawContactSelection(hdcMem, dat, selected, hottrack, rcPaint, prcItem);
break;
default:
- if (Drawing->ext_mpItemsDesc[i].itemType&CIT_EXTRA)
+ if (Drawing->ext_mpItemsDesc[i].itemType & CIT_EXTRA)
_DrawContactExtraIcon(hdcMem, dat, Drawing, selected, hottrack, prcItem, Drawing->ext_mpItemsDesc[i].itemType & 0x3F);
break;
}
}
}
- if ((Drawing->type == CLCIT_GROUP && dat->exStyle&CLS_EX_LINEWITHGROUPS)
+ if ((Drawing->type == CLCIT_GROUP && dat->exStyle & CLS_EX_LINEWITHGROUPS)
|| (Drawing->type == CLCIT_DIVIDER))
_DrawContactLine(hdcMem, Drawing, free_row_rc, rcPaint, text_rc);
}
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index b35980d456..2548b4be14 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -1878,8 +1878,6 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0);
SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, Clist::UseGroups, 0);
- SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETGREYOUTFLAGS, 0, 0);
- SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0);
for (auto &hContact : Contacts()) {
HANDLE hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0);
diff --git a/protocols/Facebook/src/groupchats.cpp b/protocols/Facebook/src/groupchats.cpp
index b5844ec3c1..2aea1370d2 100644
--- a/protocols/Facebook/src/groupchats.cpp
+++ b/protocols/Facebook/src/groupchats.cpp
@@ -40,15 +40,8 @@ class CGroupchatInviteDlg : public CFBDlgBase
void ResetListOptions(CCtrlClc *)
{
- m_clc.SetBkBitmap(0, nullptr);
- m_clc.SetBkColor(GetSysColor(COLOR_WINDOW));
- m_clc.SetGreyoutFlags(0);
- m_clc.SetLeftMargin(4);
- m_clc.SetIndent(10);
m_clc.SetHideEmptyGroups(1);
m_clc.SetHideOfflineRoot(1);
- for (int i = 0; i <= FONTID_MAX; i++)
- m_clc.SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
}
public:
diff --git a/protocols/ICQ-WIM/src/groupchats.cpp b/protocols/ICQ-WIM/src/groupchats.cpp
index 7f29b16f7a..2d7f01471f 100644
--- a/protocols/ICQ-WIM/src/groupchats.cpp
+++ b/protocols/ICQ-WIM/src/groupchats.cpp
@@ -100,15 +100,8 @@ class CGroupchatInviteDlg : public CIcqDlgBase
void ResetListOptions(CCtrlClc*)
{
- m_clc.SetBkBitmap(0, nullptr);
- m_clc.SetBkColor(GetSysColor(COLOR_WINDOW));
- m_clc.SetGreyoutFlags(0);
- m_clc.SetLeftMargin(4);
- m_clc.SetIndent(10);
m_clc.SetHideEmptyGroups(1);
m_clc.SetHideOfflineRoot(1);
- for (int i = 0; i <= FONTID_MAX; i++)
- m_clc.SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
}
public:
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 3da6353f19..2908e74bde 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -660,15 +660,8 @@ class CGroupchatInviteDlg : public CJabberDlgBase
void ResetListOptions(CCtrlClc *)
{
- m_clc.SetBkBitmap(0, nullptr);
- m_clc.SetBkColor(GetSysColor(COLOR_WINDOW));
- m_clc.SetGreyoutFlags(0);
- m_clc.SetLeftMargin(4);
- m_clc.SetIndent(10);
m_clc.SetHideEmptyGroups(1);
m_clc.SetHideOfflineRoot(1);
- for (int i = 0; i <= FONTID_MAX; i++)
- m_clc.SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
}
void InviteUser(char *pUser, char *text)
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp
index 30b01f49fd..f789dd0a82 100644
--- a/protocols/JabberG/src/jabber_privacy.cpp
+++ b/protocols/JabberG/src/jabber_privacy.cpp
@@ -933,15 +933,8 @@ class CJabberDlgPrivacyLists : public CJabberDlgBase
void CListResetOptions()
{
- m_clcClist.SetBkBitmap(0, nullptr);
- m_clcClist.SetBkColor(GetSysColor(COLOR_WINDOW));
- m_clcClist.SetGreyoutFlags(0);
- m_clcClist.SetLeftMargin(4);
- m_clcClist.SetIndent(10);
m_clcClist.SetHideEmptyGroups(false);
m_clcClist.SetHideOfflineRoot(false);
- for (int i = 0; i <= FONTID_MAX; i++)
- m_clcClist.SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
}
void CListFilter()
diff --git a/protocols/SkypeWeb/src/skype_dialogs.cpp b/protocols/SkypeWeb/src/skype_dialogs.cpp
index aaed7476d9..17f5f9bf4e 100644
--- a/protocols/SkypeWeb/src/skype_dialogs.cpp
+++ b/protocols/SkypeWeb/src/skype_dialogs.cpp
@@ -105,13 +105,6 @@ void CSkypeGCCreateDlg::FilterList(CCtrlClc *)
void CSkypeGCCreateDlg::ResetListOptions(CCtrlClc *)
{
- m_clc.SetBkBitmap(0, nullptr);
- m_clc.SetBkColor(GetSysColor(COLOR_WINDOW));
- m_clc.SetGreyoutFlags(0);
- m_clc.SetLeftMargin(4);
- m_clc.SetIndent(10);
m_clc.SetHideEmptyGroups(true);
m_clc.SetHideOfflineRoot(true);
- for (int i = 0; i <= FONTID_MAX; i++)
- m_clc.SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
}
diff --git a/protocols/VKontakte/src/vk_dialogs.cpp b/protocols/VKontakte/src/vk_dialogs.cpp
index f48746da0b..bfd4dab273 100644
--- a/protocols/VKontakte/src/vk_dialogs.cpp
+++ b/protocols/VKontakte/src/vk_dialogs.cpp
@@ -176,20 +176,20 @@ void CVkInviteChatForm::btnOk_OnOk(CCtrlButton*)
CVkGCCreateForm::CVkGCCreateForm(CVkProto *proto) :
CVkDlgBase(proto, IDD_GC_CREATE),
m_btnOk(this, IDOK),
- m_clCList(this, IDC_CLIST),
+ m_clc(this, IDC_CLIST),
m_edtTitle(this, IDC_TITLE)
{
m_btnOk.OnClick = Callback(this, &CVkGCCreateForm::btnOk_OnOk);
- m_clCList.OnListRebuilt = Callback(this, &CVkGCCreateForm::FilterList);
+ m_clc.OnListRebuilt = Callback(this, &CVkGCCreateForm::FilterList);
}
bool CVkGCCreateForm::OnInitDialog()
{
- SetWindowLongPtr(m_clCList.GetHwnd(), GWL_STYLE, GetWindowLongPtr(m_clCList.GetHwnd(), GWL_STYLE)
+ SetWindowLongPtr(m_clc.GetHwnd(), GWL_STYLE, GetWindowLongPtr(m_clc.GetHwnd(), GWL_STYLE)
| CLS_CHECKBOXES | CLS_HIDEEMPTYGROUPS | CLS_USEGROUPS | CLS_GREYALTERNATE);
- m_clCList.SendMsg(CLM_SETEXSTYLE, CLS_EX_DISABLEDRAGDROP | CLS_EX_TRACKSELECT, 0);
+ m_clc.SendMsg(CLM_SETEXSTYLE, CLS_EX_DISABLEDRAGDROP | CLS_EX_TRACKSELECT, 0);
- ResetListOptions(&m_clCList);
+ ResetListOptions();
return true;
}
@@ -200,8 +200,8 @@ void CVkGCCreateForm::btnOk_OnOk(CCtrlButton*)
if (m_proto->isChatRoom(hContact))
continue;
- HANDLE hItem = m_clCList.FindContact(hContact);
- if (hItem && m_clCList.GetCheck(hItem)) {
+ HANDLE hItem = m_clc.FindContact(hContact);
+ if (hItem && m_clc.GetCheck(hItem)) {
int uid = m_proto->getDword(hContact, "ID");
if (uid != 0) {
if (!szUIds.IsEmpty())
@@ -223,25 +223,16 @@ void CVkGCCreateForm::FilterList(CCtrlClc*)
for (auto &hContact : Contacts()) {
char *proto = Proto_GetBaseAccountName(hContact);
if (mir_strcmp(proto, m_proto->m_szModuleName) || m_proto->isChatRoom(hContact) || m_proto->getDword(hContact, "ID") == VK_FEED_USER)
- if (HANDLE hItem = m_clCList.FindContact(hContact))
- m_clCList.DeleteItem(hItem);
+ if (HANDLE hItem = m_clc.FindContact(hContact))
+ m_clc.DeleteItem(hItem);
}
}
-void CVkGCCreateForm::ResetListOptions(CCtrlClc *clCList)
+void CVkGCCreateForm::ResetListOptions()
{
- if (!clCList)
- return;
-
- clCList->SetBkBitmap(0, nullptr);
- clCList->SetBkColor(GetSysColor(COLOR_WINDOW));
- clCList->SetGreyoutFlags(0);
- clCList->SetLeftMargin(4);
- clCList->SetIndent(10);
- clCList->SetHideEmptyGroups(true);
- clCList->SetHideOfflineRoot(true);
- for (int i = 0; i <= FONTID_MAX; i++)
- clCList->SetTextColor(i, GetSysColor(COLOR_WINDOWTEXT));
+ m_clc.SetBkColor(GetSysColor(COLOR_WINDOW));
+ m_clc.SetHideEmptyGroups(true);
+ m_clc.SetHideOfflineRoot(true);
}
////////////////////////////////// IDD_CONTACTDELETE //////////////////////////////////////
diff --git a/protocols/VKontakte/src/vk_dialogs.h b/protocols/VKontakte/src/vk_dialogs.h
index 9a5cc1f12a..903e26679a 100644
--- a/protocols/VKontakte/src/vk_dialogs.h
+++ b/protocols/VKontakte/src/vk_dialogs.h
@@ -116,7 +116,7 @@ public:
class CVkGCCreateForm : public CVkDlgBase
{
CCtrlButton m_btnOk;
- CCtrlClc m_clCList;
+ CCtrlClc m_clc;
CCtrlEdit m_edtTitle;
public:
@@ -125,7 +125,7 @@ public:
void btnOk_OnOk(CCtrlButton*);
void FilterList(CCtrlClc*);
- void ResetListOptions(CCtrlClc*);
+ void ResetListOptions();
};
////////////////////////////////// IDD_CONTACTDELETE //////////////////////////////////////
diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index 55517ddc5a..811af59d11 100644
--- a/src/mir_app/src/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -185,9 +185,6 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
return CLCIT_INVALID;
return contact->type;
- case CLM_GETLEFTMARGIN:
- return dat->leftMargin;
-
case CLM_GETEXSTYLE:
return dat->exStyle;
@@ -304,17 +301,6 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
Clist_EnsureVisible(hwnd, dat, dat->selection, 0);
break;
- case CLM_SETBKBITMAP:
- if (dat->hBmpBackground) {
- DeleteObject(dat->hBmpBackground);
- dat->hBmpBackground = nullptr;
- }
- dat->hBmpBackground = (HBITMAP)lParam;
- dat->backgroundBmpUse = wParam;
- dat->bkChanged = 1;
- g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE);
- break;
-
case CLM_SETBKCOLOR:
if (dat->hBmpBackground) {
DeleteObject(dat->hBmpBackground);
@@ -380,10 +366,6 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE);
break;
- case CLM_SETGREYOUTFLAGS:
- dat->greyoutFlags = wParam;
- break;
-
case CLM_SETHIDEEMPTYGROUPS:
if (wParam)
SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | CLS_HIDEEMPTYGROUPS);
@@ -397,11 +379,6 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
Clist_InitAutoRebuild(hwnd);
break;
- case CLM_SETINDENT:
- dat->groupIndent = wParam;
- Clist_InitAutoRebuild(hwnd);
- break;
-
case CLM_SETITEMTEXT:
if (!Clist_FindItem(hwnd, dat, wParam, &contact))
break;
@@ -410,11 +387,6 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE);
break;
- case CLM_SETLEFTMARGIN:
- dat->leftMargin = wParam;
- g_clistApi.pfnInvalidateRect(hwnd, nullptr, FALSE);
- break;
-
case CLM_SETOFFLINEMODES:
dat->offlineModes = wParam;
Clist_InitAutoRebuild(hwnd);
diff --git a/src/mir_core/src/CCtrlClc.cpp b/src/mir_core/src/CCtrlClc.cpp
index bfc2b1e086..b070b5c8b4 100644
--- a/src/mir_core/src/CCtrlClc.cpp
+++ b/src/mir_core/src/CCtrlClc.cpp
@@ -138,10 +138,6 @@ void CCtrlClc::SelectItem(HANDLE hItem)
{ SendMessage(m_hwnd, CLM_SELECTITEM, (WPARAM)hItem, 0);
}
-void CCtrlClc::SetBkBitmap(DWORD mode, HBITMAP hBitmap)
-{ SendMessage(m_hwnd, CLM_SETBKBITMAP, mode, (LPARAM)hBitmap);
-}
-
void CCtrlClc::SetBkColor(COLORREF clBack)
{ SendMessage(m_hwnd, CLM_SETBKCOLOR, (WPARAM)clBack, 0);
}
@@ -166,10 +162,6 @@ void CCtrlClc::SetFont(int iFontId, HANDLE hFont, bool bRedraw)
{ SendMessage(m_hwnd, CLM_SETFONT, (WPARAM)hFont, MAKELPARAM(bRedraw ? 1 : 0, iFontId));
}
-void CCtrlClc::SetIndent(int iIndent)
-{ SendMessage(m_hwnd, CLM_SETINDENT, (WPARAM)iIndent, 0);
-}
-
void CCtrlClc::SetItemText(HANDLE hItem, char *szText)
{ SendMessage(m_hwnd, CLM_SETITEMTEXT, (WPARAM)hItem, (LPARAM)szText);
}
@@ -178,10 +170,6 @@ void CCtrlClc::SetHideEmptyGroups(bool state)
{ SendMessage(m_hwnd, CLM_SETHIDEEMPTYGROUPS, state ? 1 : 0, 0);
}
-void CCtrlClc::SetGreyoutFlags(DWORD flags)
-{ SendMessage(m_hwnd, CLM_SETGREYOUTFLAGS, (WPARAM)flags, 0);
-}
-
bool CCtrlClc::GetHideOfflineRoot()
{ return SendMessage(m_hwnd, CLM_GETHIDEOFFLINEROOT, 0, 0) ? true : false;
}
@@ -206,14 +194,6 @@ void CCtrlClc::SetExStyle(DWORD exStyle)
{ SendMessage(m_hwnd, CLM_SETEXSTYLE, (WPARAM)exStyle, 0);
}
-int CCtrlClc::GetLefrMargin()
-{ return SendMessage(m_hwnd, CLM_GETLEFTMARGIN, 0, 0);
-}
-
-void CCtrlClc::SetLeftMargin(int iMargin)
-{ SendMessage(m_hwnd, CLM_SETLEFTMARGIN, (WPARAM)iMargin, 0);
-}
-
HANDLE CCtrlClc::AddInfoItem(CLCINFOITEM *cii)
{ return (HANDLE)SendMessage(m_hwnd, CLM_ADDINFOITEM, 0, (LPARAM)cii);
}
@@ -225,11 +205,3 @@ int CCtrlClc::GetItemType(HANDLE hItem)
HANDLE CCtrlClc::GetNextItem(HANDLE hItem, DWORD flags)
{ return (HANDLE)SendMessage(m_hwnd, CLM_GETNEXTITEM, (WPARAM)flags, (LPARAM)hItem);
}
-
-COLORREF CCtrlClc::GetTextColor(int iFontId)
-{ return (COLORREF)SendMessage(m_hwnd, CLM_GETTEXTCOLOR, (WPARAM)iFontId, 0);
-}
-
-void CCtrlClc::SetTextColor(int iFontId, COLORREF clText)
-{ SendMessage(m_hwnd, CLM_SETTEXTCOLOR, (WPARAM)iFontId, (LPARAM)clText);
-}
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index cc0713af90..762ddcc9be 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -646,7 +646,6 @@ mir_wstrcmpi @280
?GetItemText@CCtrlListView@@QAEXHHPA_WH@Z @833 NONAME
?GetItemType@CCtrlClc@@QAEHPAX@Z @834 NONAME
?GetLastVisible@CCtrlTreeView@@QAEPAU_TREEITEM@@XZ @835 NONAME
-?GetLefrMargin@CCtrlClc@@QAEHXZ @836 NONAME
?GetLineColor@CCtrlTreeView@@QAEKXZ @837 NONAME
?GetNextItem@CCtrlClc@@QAEPAXPAXK@Z @838 NONAME
?GetNextItem@CCtrlListView@@QAEHHI@Z @839 NONAME
@@ -681,7 +680,6 @@ mir_wstrcmpi @280
?GetTextBkColor@CCtrlListView@@QAEKXZ @869 NONAME
?GetTextColor@CCtrlListView@@QAEKXZ @870 NONAME
?GetTextColor@CCtrlTreeView@@QAEKXZ @871 NONAME
-?GetTextColor@CCtrlClc@@QAEKH@Z @872 NONAME
?GetTileInfo@CCtrlListView@@QAEXPAUtagLVTILEINFO@@@Z @873 NONAME
?GetTileViewInfo@CCtrlListView@@QAEXPAUtagLVTILEVIEWINFO@@@Z @874 NONAME
?GetToolTips@CCtrlListView@@QAEPAUHWND__@@XZ @875 NONAME
@@ -776,7 +774,6 @@ mir_wstrcmpi @280
?SelectString@CCtrlCombo@@QAEHPB_W@Z @969 NONAME
?SelectString@CCtrlListBox@@QAEHPB_W@Z @970 NONAME
?SendMsg@CCtrlBase@@QBEJIIJ@Z @971 NONAME
-?SetBkBitmap@CCtrlClc@@QAEXKPAUHBITMAP__@@@Z @972 NONAME
?SetBkColor@CCtrlClc@@QAEXK@Z @973 NONAME
?SetBkColor@CCtrlListView@@QAEHK@Z @974 NONAME
?SetBkColor@CCtrlTreeView@@QAEKK@Z @975 NONAME
@@ -797,7 +794,6 @@ mir_wstrcmpi @280
?SetExtraImage@CCtrlClc@@QAEXPAXHH@Z @990 NONAME
?SetExtraImageList@CCtrlClc@@QAEXPAU_IMAGELIST@@@Z @991 NONAME
?SetFont@CCtrlClc@@QAEXHPAX_N@Z @992 NONAME
-?SetGreyoutFlags@CCtrlClc@@QAEXK@Z @993 NONAME
?SetGroupInfo@CCtrlListView@@QAEHHPAUtagLVGROUP@@@Z @994 NONAME
?SetGroupMetrics@CCtrlListView@@QAEXPAUtagLVGROUPMETRICS@@@Z @995 NONAME
?SetHideEmptyGroups@CCtrlClc@@QAEX_N@Z @996 NONAME
@@ -808,7 +804,6 @@ mir_wstrcmpi @280
?SetIconSpacing@CCtrlListView@@QAEKHH@Z @1001 NONAME
?SetImageList@CCtrlListView@@QAEPAU_IMAGELIST@@PAU2@H@Z @1002 NONAME
?SetImageList@CCtrlTreeView@@QAEXPAU_IMAGELIST@@H@Z @1003 NONAME
-?SetIndent@CCtrlClc@@QAEXH@Z @1004 NONAME
?SetIndent@CCtrlTreeView@@QAEXH@Z @1005 NONAME
?SetInfoTip@CCtrlListView@@QAEHPAUtagLVSETINFOTIP@@@Z @1006 NONAME
?SetInsertMark@CCtrlListView@@QAEHPAULVINSERTMARK@@@Z @1007 NONAME
@@ -830,7 +825,6 @@ mir_wstrcmpi @280
?SetItemState@CCtrlTreeView@@QAEXPAU_TREEITEM@@KK@Z @1023 NONAME
?SetItemText@CCtrlClc@@QAEXPAXPAD@Z @1024 NONAME
?SetItemText@CCtrlListView@@QAEXHHPB_W@Z @1025 NONAME
-?SetLeftMargin@CCtrlClc@@QAEXH@Z @1026 NONAME
?SetLineColor@CCtrlTreeView@@QAEKK@Z @1027 NONAME
?SetOfflineModes@CCtrlClc@@QAEXK@Z @1028 NONAME
?SetOutlineColor@CCtrlListView@@QAEKK@Z @1029 NONAME
@@ -842,7 +836,6 @@ mir_wstrcmpi @280
?SetText@CCtrlBase@@QAEXPB_W@Z @1036 NONAME
?SetTextA@CCtrlBase@@QAEXPBD@Z @1037 NONAME
?SetTextBkColor@CCtrlListView@@QAEHK@Z @1038 NONAME
-?SetTextColor@CCtrlClc@@QAEXHK@Z @1039 NONAME
?SetTextColor@CCtrlListView@@QAEHK@Z @1040 NONAME
?SetTextColor@CCtrlTreeView@@QAEKK@Z @1041 NONAME
?SetTileInfo@CCtrlListView@@QAEHPAUtagLVTILEINFO@@@Z @1042 NONAME
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 640a6628f3..d7090d5360 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -646,7 +646,6 @@ mir_wstrcmpi @280
?GetItemText@CCtrlListView@@QEAAXHHPEA_WH@Z @833 NONAME
?GetItemType@CCtrlClc@@QEAAHPEAX@Z @834 NONAME
?GetLastVisible@CCtrlTreeView@@QEAAPEAU_TREEITEM@@XZ @835 NONAME
-?GetLefrMargin@CCtrlClc@@QEAAHXZ @836 NONAME
?GetLineColor@CCtrlTreeView@@QEAAKXZ @837 NONAME
?GetNextItem@CCtrlClc@@QEAAPEAXPEAXK@Z @838 NONAME
?GetNextItem@CCtrlListView@@QEAAHHI@Z @839 NONAME
@@ -681,7 +680,6 @@ mir_wstrcmpi @280
?GetTextBkColor@CCtrlListView@@QEAAKXZ @869 NONAME
?GetTextColor@CCtrlListView@@QEAAKXZ @870 NONAME
?GetTextColor@CCtrlTreeView@@QEAAKXZ @871 NONAME
-?GetTextColor@CCtrlClc@@QEAAKH@Z @872 NONAME
?GetTileInfo@CCtrlListView@@QEAAXPEAUtagLVTILEINFO@@@Z @873 NONAME
?GetTileViewInfo@CCtrlListView@@QEAAXPEAUtagLVTILEVIEWINFO@@@Z @874 NONAME
?GetToolTips@CCtrlListView@@QEAAPEAUHWND__@@XZ @875 NONAME
@@ -776,7 +774,6 @@ mir_wstrcmpi @280
?SelectString@CCtrlCombo@@QEAAHPEB_W@Z @969 NONAME
?SelectString@CCtrlListBox@@QEAAHPEB_W@Z @970 NONAME
?SendMsg@CCtrlBase@@QEBA_JI_K_J@Z @971 NONAME
-?SetBkBitmap@CCtrlClc@@QEAAXKPEAUHBITMAP__@@@Z @972 NONAME
?SetBkColor@CCtrlClc@@QEAAXK@Z @973 NONAME
?SetBkColor@CCtrlListView@@QEAAHK@Z @974 NONAME
?SetBkColor@CCtrlTreeView@@QEAAKK@Z @975 NONAME
@@ -797,7 +794,6 @@ mir_wstrcmpi @280
?SetExtraImage@CCtrlClc@@QEAAXPEAXHH@Z @990 NONAME
?SetExtraImageList@CCtrlClc@@QEAAXPEAU_IMAGELIST@@@Z @991 NONAME
?SetFont@CCtrlClc@@QEAAXHPEAX_N@Z @992 NONAME
-?SetGreyoutFlags@CCtrlClc@@QEAAXK@Z @993 NONAME
?SetGroupInfo@CCtrlListView@@QEAAHHPEAUtagLVGROUP@@@Z @994 NONAME
?SetGroupMetrics@CCtrlListView@@QEAAXPEAUtagLVGROUPMETRICS@@@Z @995 NONAME
?SetHideEmptyGroups@CCtrlClc@@QEAAX_N@Z @996 NONAME
@@ -808,7 +804,6 @@ mir_wstrcmpi @280
?SetIconSpacing@CCtrlListView@@QEAAKHH@Z @1001 NONAME
?SetImageList@CCtrlListView@@QEAAPEAU_IMAGELIST@@PEAU2@H@Z @1002 NONAME
?SetImageList@CCtrlTreeView@@QEAAXPEAU_IMAGELIST@@H@Z @1003 NONAME
-?SetIndent@CCtrlClc@@QEAAXH@Z @1004 NONAME
?SetIndent@CCtrlTreeView@@QEAAXH@Z @1005 NONAME
?SetInfoTip@CCtrlListView@@QEAAHPEAUtagLVSETINFOTIP@@@Z @1006 NONAME
?SetInsertMark@CCtrlListView@@QEAAHPEAULVINSERTMARK@@@Z @1007 NONAME
@@ -830,7 +825,6 @@ mir_wstrcmpi @280
?SetItemState@CCtrlTreeView@@QEAAXPEAU_TREEITEM@@KK@Z @1023 NONAME
?SetItemText@CCtrlClc@@QEAAXPEAXPEAD@Z @1024 NONAME
?SetItemText@CCtrlListView@@QEAAXHHPEB_W@Z @1025 NONAME
-?SetLeftMargin@CCtrlClc@@QEAAXH@Z @1026 NONAME
?SetLineColor@CCtrlTreeView@@QEAAKK@Z @1027 NONAME
?SetOfflineModes@CCtrlClc@@QEAAXK@Z @1028 NONAME
?SetOutlineColor@CCtrlListView@@QEAAKK@Z @1029 NONAME
@@ -842,7 +836,6 @@ mir_wstrcmpi @280
?SetText@CCtrlBase@@QEAAXPEB_W@Z @1036 NONAME
?SetTextA@CCtrlBase@@QEAAXPEBD@Z @1037 NONAME
?SetTextBkColor@CCtrlListView@@QEAAHK@Z @1038 NONAME
-?SetTextColor@CCtrlClc@@QEAAXHK@Z @1039 NONAME
?SetTextColor@CCtrlListView@@QEAAHK@Z @1040 NONAME
?SetTextColor@CCtrlTreeView@@QEAAKK@Z @1041 NONAME
?SetTileInfo@CCtrlListView@@QEAAHPEAUtagLVTILEINFO@@@Z @1042 NONAME
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 09:28:34 +0000