From 37b53d2a7b305d22bc6bde4296f009c2da4e32f5 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 2 Dec 2003 08:56:47 +0000 Subject: [PATCH] Patches from "Viktor Voroshylo" isses with context menu on real PocketPC device static text not showing full message under WinCE git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24694 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/listctrl.cpp | 10 ++++++++++ src/msw/stattext.cpp | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/msw/listctrl.cpp b/src/msw/listctrl.cpp index f548be6ac3..b0633936f3 100644 --- a/src/msw/listctrl.cpp +++ b/src/msw/listctrl.cpp @@ -1822,6 +1822,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) // where did the click occur? POINT ptClick; +#ifdef __WXWINCE__ + if(nmhdr->code == GN_CONTEXTMENU) { + ptClick = ((NMRGINFO*)nmhdr)->ptAction; + } else +#endif __WXWINCE__ if ( !::GetCursorPos(&ptClick) ) { wxLogLastError(_T("GetCursorPos")); @@ -2152,6 +2157,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) LV_HITTESTINFO lvhti; wxZeroMemory(lvhti); +#ifdef __WXWINCE__ + if(nmhdr->code == GN_CONTEXTMENU) { + lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction; + } else +#endif __WXWINCE__ ::GetCursorPos(&(lvhti.pt)); ::ScreenToClient(GetHwnd(),&(lvhti.pt)); if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 ) diff --git a/src/msw/stattext.cpp b/src/msw/stattext.cpp index d281fe97b6..f11e04cb19 100644 --- a/src/msw/stattext.cpp +++ b/src/msw/stattext.cpp @@ -192,7 +192,9 @@ wxSize wxStaticText::DoGetBestSize() const curLine += *pc; } } - +#ifdef __WXWINCE__ + if(widthTextMax) widthTextMax += 2; +#endif return wxSize(widthTextMax, heightTextTotal); } -- 2.45.2