diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-12 13:12:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-12 13:12:52 +0000 |
| commit | 70dc611c18f94358749c6aa682ebaaa34ca44d18 (patch) | |
| tree | 0d2c90eda0c7fff9d483480e5781d46fef395c87 /plugins | |
| parent | d91ea9f58d10af27c06aaffb77c2ac7f436cf7ff (diff) | |
more naming conflicts resolved
git-svn-id: http://svn.miranda-ng.org/main/trunk@14924 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Scriver/src/utils.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index c064d623c7..cea74321c6 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define TTI_NONE 0
#endif
-wchar_t *a2w(const char *src, int len)
+wchar_t* a2w(const char *src, int len)
{
wchar_t *wline;
int i;
@@ -44,7 +44,8 @@ wchar_t *a2w(const char *src, int len) static int mimFlags = 0;
-enum MIMFLAGS {
+enum MIMFLAGS
+{
MIM_CHECKED = 1,
MIM_UNICODE = 2
};
@@ -99,7 +100,7 @@ char* GetRichTextUtf(HWND hwnd) int textBufferSize = GetRichTextLength(hwnd, CP_UTF8, TRUE);
if (textBufferSize == 0)
return NULL;
-
+
textBufferSize++;
char *textBuffer = (char*)mir_alloc(textBufferSize);
@@ -117,7 +118,7 @@ int SetRichText(HWND hwnd, const TCHAR *text) st.flags = ST_DEFAULT;
st.codepage = 1200;
SendMessage(hwnd, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)text);
-
+
return GetRichTextLength(hwnd, 1200, FALSE);
}
@@ -127,7 +128,7 @@ int SetRichTextRTF(HWND hwnd, const char *text) st.flags = ST_DEFAULT;
st.codepage = CP_UTF8;
SendMessage(hwnd, EM_SETTEXTEX, (WPARAM)&st, (LPARAM)text);
-
+
return GetRichTextLength(hwnd, 1200, FALSE);
}
@@ -325,7 +326,7 @@ int DrawMenuItem(WPARAM, LPARAM lParam) hiliteCol = GetSysColor(COLOR_3DHIGHLIGHT);
hBrush = CreateSolidBrush(RGB
((GetRValue(menuCol) + GetRValue(hiliteCol)) / 2, (GetGValue(menuCol) + GetGValue(hiliteCol)) / 2,
- (GetBValue(menuCol) + GetBValue(hiliteCol)) / 2));
+ (GetBValue(menuCol) + GetBValue(hiliteCol)) / 2));
FillRect(dis->hDC, &rc, hBrush);
DeleteObject(hBrush);
ImageList_DrawEx((HIMAGELIST)dis->itemData, id, dis->hDC, 2, y, 0, 0, CLR_NONE, GetSysColor(COLOR_MENU), ILD_BLEND25);
|