Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor parts from FM's wxDataViewCtrl patch.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44522 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-02-17 11:35:58 +00:00
parent 4a11340a1c
commit a9fdf82418
2 changed files with 87 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/msw/listctrl.cpp
View File

@@ -1769,6 +1769,50 @@ bool wxListCtrl::MSWCommand(WXUINT cmd, WXWORD id)
return false;
}
// utility used by wxListCtrl::MSWOnNotify and by wxDataViewHeaderWindowMSW::MSWOnNotify
unsigned int wxMSWGetColumnClicked(NMHDR *nmhdr, POINT *ptClick)
{
wxASSERT(nmhdr && ptClick);
// find the column clicked: we have to search for it
// ourselves as the notification message doesn't provide
// this info
// where did the click occur?
#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
if (nmhdr->code == GN_CONTEXTMENU)
{
*ptClick = ((NMRGINFO*)nmhdr)->ptAction;
}
else
#endif //__WXWINCE__
if ( !::GetCursorPos(ptClick) )
{
wxLogLastError(_T("GetCursorPos"));
}
if ( !::ScreenToClient(nmhdr->hwndFrom, ptClick) )
{
wxLogLastError(_T("ScreenToClient(header)"));
}
int colCount = Header_GetItemCount(nmhdr->hwndFrom);
RECT rect;
for ( int col = 0; col < colCount; col++ )
{
if ( Header_GetItemRect(nmhdr->hwndFrom, col, &rect) )
{
if ( ::PtInRect(&rect, *ptClick) )
{
return col;
}
}
}
return wxNOT_FOUND;
}
bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{
@@ -1836,47 +1880,12 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
#endif //__WXWINCE__
case NM_RCLICK:
{
eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
event.m_col = -1;
// find the column clicked: we have to search for it
// ourselves as the notification message doesn't provide
// this info
// where did the click occur?
POINT ptClick;
#if defined(__WXWINCE__) && !defined(__HANDHELDPC__) && _WIN32_WCE < 400
if(nmhdr->code == GN_CONTEXTMENU) {
ptClick = ((NMRGINFO*)nmhdr)->ptAction;
} else
#endif //__WXWINCE__
if ( !::GetCursorPos(&ptClick) )
{
wxLogLastError(_T("GetCursorPos"));
}
if ( !::ScreenToClient(GetHwnd(), &ptClick) )
{
wxLogLastError(_T("ScreenToClient(listctrl header)"));
}
eventType = wxEVT_COMMAND_LIST_COL_RIGHT_CLICK;
event.m_col = wxMSWGetColumnClicked(nmhdr, &ptClick);
event.m_pointDrag.x = ptClick.x;
event.m_pointDrag.y = ptClick.y;
int colCount = Header_GetItemCount(hwndHdr);
RECT rect;
for ( int col = 0; col < colCount; col++ )
{
if ( Header_GetItemRect(hwndHdr, col, &rect) )
{
if ( ::PtInRect(&rect, ptClick) )
{
event.m_col = col;
break;
}
}
}
}
break;
@@ -1886,7 +1895,7 @@ bool wxListCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// parameters
//
// I have no idea what is the real cause of the bug (which is,
// just to make things interesting, is impossible to reproduce
// just to make things interesting, impossible to reproduce
// reliably) but ignoring all these messages does fix it and
// doesn't seem to have any negative consequences
return true;

40
src/msw/renderer.cpp
View File

@@ -154,6 +154,12 @@ public:
const wxRect& rect,
int flags = 0);
virtual void DrawItemSelectionRect(wxWindow *win,
wxDC& dc,
const wxRect& rect,
int flags = 0 );
virtual wxSplitterRenderParams GetSplitterParams(const wxWindow *win);
private:
DECLARE_NO_COPY_CLASS(wxRendererXP)
@@ -469,6 +475,40 @@ wxRendererXP::DrawPushButton(wxWindow * win,
}
void
wxRendererXP::DrawItemSelectionRect(wxWindow * WXUNUSED(win),
wxDC& dc,
const wxRect& rect,
int flags)
{
wxBrush brush;
if ( flags & wxCONTROL_SELECTED )
{
if ( flags & wxCONTROL_FOCUSED )
{
brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT));
}
else // !focused
{
brush = wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_BTNSHADOW));
}
}
else // !selected
{
brush = *wxTRANSPARENT_BRUSH;
}
dc.SetBrush(brush);
// unlike for wxRendererGeneric, on windows we _never_ want to draw
// the outline of the rectangle:
dc.SetPen(*wxTRANSPARENT_PEN);
dc.DrawRectangle( rect );
}
// ----------------------------------------------------------------------------
// splitter drawing
// ----------------------------------------------------------------------------