diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 16:02:14 +0000 |
| commit | 67f1c36da9aca19e37803110aa243280e5cf053b (patch) | |
| tree | 2ded9275bfcbcea8151a4b32deb6c14c95de0e78 /plugins/Clist_nicer/SRC/clcpaint.cpp | |
| parent | 4aa6229698b946e52ce19018aaf13f8b92fb168e (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@427 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_nicer/SRC/clcpaint.cpp')
| -rw-r--r-- | plugins/Clist_nicer/SRC/clcpaint.cpp | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/plugins/Clist_nicer/SRC/clcpaint.cpp b/plugins/Clist_nicer/SRC/clcpaint.cpp index 7d3d799992..ef7cf12932 100644 --- a/plugins/Clist_nicer/SRC/clcpaint.cpp +++ b/plugins/Clist_nicer/SRC/clcpaint.cpp @@ -497,7 +497,7 @@ void __inline PaintItem(HDC hdcMem, struct ClcGroup *group, struct ClcContact *c else
cEntry = cfg::eCache;
-#if defined(_UNICODE)
+
if(dat->bisEmbedded)
goto set_bg_l;
@@ -525,16 +525,7 @@ void __inline PaintItem(HDC hdcMem, struct ClcGroup *group, struct ClcContact *c bg_indent_l = cfg::dat.bApplyIndentToBg ? indent * dat->groupIndent : 0;
set_bg_l:
-#else
- if(type == CLCIT_GROUP && cfg::dat.bGroupAlign == CLC_GROUPALIGN_RIGHT && !dat->bisEmbedded && API::pfnSetLayout != 0) {
- g_RTL = TRUE;
- bg_indent_r = cfg::dat.bApplyIndentToBg ? indent * dat->groupIndent : 0;
- }
- else {
- g_RTL = FALSE;
- bg_indent_l = cfg::dat.bApplyIndentToBg ? indent * dat->groupIndent : 0;
- }
-#endif
+
g_hottrack = dat->exStyle & CLS_EX_TRACKSELECT && type == CLCIT_CONTACT && dat->iHotTrack == index;
if (g_hottrack == selected)
@@ -1276,11 +1267,9 @@ nodisplay: if ((dwFlags & CLUI_FRAME_SHOWSTATUSMSG && smsgValid > STATUSMSG_XSTATUSID) || smsgValid == STATUSMSG_XSTATUSNAME)
szText = cEntry->statusMsg;
else
-#if defined(_UNICODE)
+
szText = &statusNames[cstatus - ID_STATUS_OFFLINE][0];
-#else
- szText = statusNames[cstatus - ID_STATUS_OFFLINE];
-#endif
+
if(cEntry->dwCFlags & ECF_RTLSTATUSMSG && cfg::dat.bUseDCMirroring == 3)
dt_2ndrowflags |= (DT_RTLREADING | DT_RIGHT);
|