Patches from "Viktor Voroshylo" <viktor@voroshylo.com>
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
This commit is contained in:
@@ -1822,6 +1822,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
|
|
||||||
// where did the click occur?
|
// where did the click occur?
|
||||||
POINT ptClick;
|
POINT ptClick;
|
||||||
|
#ifdef __WXWINCE__
|
||||||
|
if(nmhdr->code == GN_CONTEXTMENU) {
|
||||||
|
ptClick = ((NMRGINFO*)nmhdr)->ptAction;
|
||||||
|
} else
|
||||||
|
#endif __WXWINCE__
|
||||||
if ( !::GetCursorPos(&ptClick) )
|
if ( !::GetCursorPos(&ptClick) )
|
||||||
{
|
{
|
||||||
wxLogLastError(_T("GetCursorPos"));
|
wxLogLastError(_T("GetCursorPos"));
|
||||||
@@ -2152,6 +2157,11 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
|
|||||||
LV_HITTESTINFO lvhti;
|
LV_HITTESTINFO lvhti;
|
||||||
wxZeroMemory(lvhti);
|
wxZeroMemory(lvhti);
|
||||||
|
|
||||||
|
#ifdef __WXWINCE__
|
||||||
|
if(nmhdr->code == GN_CONTEXTMENU) {
|
||||||
|
lvhti.pt = ((NMRGINFO*)nmhdr)->ptAction;
|
||||||
|
} else
|
||||||
|
#endif __WXWINCE__
|
||||||
::GetCursorPos(&(lvhti.pt));
|
::GetCursorPos(&(lvhti.pt));
|
||||||
::ScreenToClient(GetHwnd(),&(lvhti.pt));
|
::ScreenToClient(GetHwnd(),&(lvhti.pt));
|
||||||
if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
|
if ( ListView_HitTest(GetHwnd(),&lvhti) != -1 )
|
||||||
|
@@ -192,7 +192,9 @@ wxSize wxStaticText::DoGetBestSize() const
|
|||||||
curLine += *pc;
|
curLine += *pc;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#ifdef __WXWINCE__
|
||||||
|
if(widthTextMax) widthTextMax += 2;
|
||||||
|
#endif
|
||||||
return wxSize(widthTextMax, heightTextTotal);
|
return wxSize(widthTextMax, heightTextTotal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user