From 042c8d7b52216f2f9fa20b498716ccbec3b000bf Mon Sep 17 00:00:00 2001 From: Vlad Mironov Date: Mon, 10 Dec 2012 13:22:55 +0000 Subject: TrafficCounter: fixed crash when displaying tooltip git-svn-id: http://svn.miranda-ng.org/main/trunk@2712 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TrafficCounter/res/resource.rc | 4 ++-- plugins/TrafficCounter/src/TrafficCounter.c | 11 +++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'plugins') diff --git a/plugins/TrafficCounter/res/resource.rc b/plugins/TrafficCounter/res/resource.rc index dad0617b25..5e33d3d57b 100644 --- a/plugins/TrafficCounter/res/resource.rc +++ b/plugins/TrafficCounter/res/resource.rc @@ -46,7 +46,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT // Dialog // -IDD_OPT_STATS DIALOGEX 0, 0, 305, 240 +IDD_OPT_STATS DIALOGEX 0, 0, 305, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN @@ -118,7 +118,7 @@ BEGIN PUSHBUTTON "Test",IDC_TEST,251,93,50,11 END -IDD_OPT_TRAFFIC DIALOGEX 0, 0, 305, 245 +IDD_OPT_TRAFFIC DIALOGEX 0, 0, 305, 230 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 diff --git a/plugins/TrafficCounter/src/TrafficCounter.c b/plugins/TrafficCounter/src/TrafficCounter.c index b7fe86b3d6..0a4b7b48a3 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.c +++ b/plugins/TrafficCounter/src/TrafficCounter.c @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "commonheaders.h" #include "m_skin_eng.h" +#include "m_tipper.h" /*-------------------------------------------------------------------------------------------------------------------*/ //GLOBAL @@ -1427,13 +1428,11 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP ti.rcItem.bottom = TooltipPosition.y + 10; ti.cbSize = sizeof( ti ); TooltipText = variables_parsedup(Traffic_TooltipFormat, NULL, NULL); -#ifdef _UNICODE - CallService("mToolTip/ShowTipW", (WPARAM)TooltipText, (LPARAM)&ti); -#else - CallService("mToolTip/ShowTip", (WPARAM)TooltipText, (LPARAM)&ti); -#endif + + CallService(MS_TIPPER_SHOWTIPW, (WPARAM)TooltipText, (LPARAM)&ti); + TooltipShowing = TRUE; - free(TooltipText); + mir_free(TooltipText); } } } -- cgit v1.2.3