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

#9559 DataViewCtrl wrong behaviour with reordering not reorderable columns

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2008-06-11 07:43:42 +00:00
parent fc32630a5e
commit 029458cec9
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/generic/datavgen.cpp
View File

@@ -168,6 +168,7 @@ protected:
int m_scrollOffsetX; int m_scrollOffsetX;
int m_buttonHeight; int m_buttonHeight;
bool m_vetoColumnDrag;
bool m_delayedUpdate; bool m_delayedUpdate;
wxImageList *m_imageList; wxImageList *m_imageList;
@@ -1327,6 +1328,7 @@ bool wxDataViewHeaderWindowMSW::Create( wxDataViewCtrl *parent, wxWindowID id,
m_scrollOffsetX = 0; m_scrollOffsetX = 0;
m_delayedUpdate = false; m_delayedUpdate = false;
m_vetoColumnDrag = false;
m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this ); m_buttonHeight = wxRendererNative::Get().GetHeaderButtonHeight( this );
int x = pos.x == wxDefaultCoord ? 0 : pos.x, int x = pos.x == wxDefaultCoord ? 0 : pos.x,
@@ -1506,6 +1508,13 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
NMHEADER *nmHDR = (NMHEADER *)nmhdr; NMHEADER *nmHDR = (NMHEADER *)nmhdr;
switch ( nmhdr->code ) switch ( nmhdr->code )
{ {
case NM_RELEASEDCAPTURE:
{
// user has released the mouse
m_vetoColumnDrag = false;
}
break;
case HDN_BEGINTRACK: case HDN_BEGINTRACK:
// user has started to resize a column: // user has started to resize a column:
// do we need to veto it? // do we need to veto it?
@@ -1517,11 +1526,21 @@ bool wxDataViewHeaderWindowMSW::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARA
break; break;
case HDN_BEGINDRAG: case HDN_BEGINDRAG:
// user has started to reorder a column // valid column
if ((nmHDR->iItem != -1) && (!GetColumn(nmHDR->iItem)->IsReorderable())) if (nmHDR->iItem != -1)
{
// user has started to reorder a valid column
if ((m_vetoColumnDrag == true) || (!GetColumn(nmHDR->iItem)->IsReorderable()))
{
// veto it!
*result = TRUE;
m_vetoColumnDrag = true;
}
}
else
{ {
// veto it! // veto it!
*result = TRUE; m_vetoColumnDrag = true;
} }
break; break;