diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-27 17:07:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-27 17:07:10 +0000 |
| commit | 87fff9deac0941da4e87728f14c917700d5bbdec (patch) | |
| tree | 99e0942bba2ab6b71390b5856a1cba3340ff73f4 /plugins/Utils | |
| parent | f12258520128cd7e4f758ba5840ffb4704cea7c8 (diff) | |
name conflicts
git-svn-id: http://svn.miranda-ng.org/main/trunk@15046 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Utils')
| -rw-r--r-- | plugins/Utils/mir_smileys.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Utils/mir_smileys.cpp b/plugins/Utils/mir_smileys.cpp index 1c27bd67fc..6ecd7ce27b 100644 --- a/plugins/Utils/mir_smileys.cpp +++ b/plugins/Utils/mir_smileys.cpp @@ -236,10 +236,10 @@ SIZE GetTextSize(HDC hdcMem, const TCHAR *szText, SortedList *plText, UINT uText TextPiece *piece = (TextPiece *)plText->items[i];
if (piece->type == TEXT_PIECE_TYPE_TEXT) {
- RECT text_rc = { 0, 0, 0x7FFFFFFF, 0x7FFFFFFF };
+ RECT rc = { 0, 0, 0x7FFFFFFF, 0x7FFFFFFF };
- DrawText(hdcMem, &szText[piece->start_pos], piece->len, &text_rc, DT_CALCRECT | uTextFormat);
- text_size.cx = text_size.cx + text_rc.right - text_rc.left;
+ DrawText(hdcMem, &szText[piece->start_pos], piece->len, &rc, DT_CALCRECT | uTextFormat);
+ text_size.cx = text_size.cx + rc.right - rc.left;
}
else {
double factor;
|