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

Applied fix #11254: assert on wxEVT_MOUSE_CAPTURE_LOST and wxGrid

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66942 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-02-17 12:30:56 +00:00
parent 689839ed87
commit 2387014dba
3 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/generic/grid.h
View File

@@ -1776,6 +1776,11 @@ public:
// overridden wxWindow methods
virtual void Fit();
#if wxABI_VERSION >= 20812
// implementation only
void CancelMouseCapture();
#endif
protected:
virtual wxSize DoGetBestSize() const;
@@ -2091,7 +2096,7 @@ public:
return ControlDown();
#endif
}
virtual wxEvent *Clone() const { return new wxGridSizeEvent(*this); }
protected:
@@ -2148,7 +2153,7 @@ public:
return ControlDown();
#endif
}
virtual wxEvent *Clone() const { return new wxGridRangeSelectEvent(*this); }
protected:
@@ -2183,7 +2188,7 @@ public:
void SetRow(int row) { m_row = row; }
void SetCol(int col) { m_col = col; }
void SetControl(wxControl* ctrl) { m_ctrl = ctrl; }
virtual wxEvent *Clone() const { return new wxGridEditorCreatedEvent(*this); }
private:

98
src/generic/grid.cpp
View File

@@ -147,18 +147,45 @@ DEFINE_EVENT_TYPE(wxEVT_GRID_EDITOR_CREATED)
// private classes
// ----------------------------------------------------------------------------
class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxWindow
// common base class for various grid subwindows
class WXDLLIMPEXP_ADV wxGridSubwindow : public wxWindow
{
public:
wxGridRowLabelWindow() { m_owner = (wxGrid *)NULL; }
wxGridSubwindow() { m_owner = NULL; }
wxGridSubwindow(wxGrid *owner,
wxWindowID id,
const wxPoint& pos,
const wxSize& size,
int additionalStyle = 0,
const wxString& name = wxPanelNameStr)
: wxWindow(owner, id, pos, size,
wxWANTS_CHARS | wxBORDER_NONE | additionalStyle,
name)
{
m_owner = owner;
}
wxGrid *GetOwner() { return m_owner; }
protected:
void OnMouseCaptureLost(wxMouseCaptureLostEvent& event);
wxGrid *m_owner;
DECLARE_EVENT_TABLE()
DECLARE_NO_COPY_CLASS(wxGridSubwindow)
};
class WXDLLIMPEXP_ADV wxGridRowLabelWindow : public wxGridSubwindow
{
public:
wxGridRowLabelWindow() { }
wxGridRowLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
virtual bool AcceptsFocus() const { return false; }
private:
wxGrid *m_owner;
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
@@ -172,18 +199,16 @@ private:
};
class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxWindow
class WXDLLIMPEXP_ADV wxGridColLabelWindow : public wxGridSubwindow
{
public:
wxGridColLabelWindow() { m_owner = (wxGrid *)NULL; }
wxGridColLabelWindow() { }
wxGridColLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
virtual bool AcceptsFocus() const { return false; }
private:
wxGrid *m_owner;
void OnPaint( wxPaintEvent& event );
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
@@ -197,18 +222,16 @@ private:
};
class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxWindow
class WXDLLIMPEXP_ADV wxGridCornerLabelWindow : public wxGridSubwindow
{
public:
wxGridCornerLabelWindow() { m_owner = (wxGrid *)NULL; }
wxGridCornerLabelWindow() { }
wxGridCornerLabelWindow( wxGrid *parent, wxWindowID id,
const wxPoint &pos, const wxSize &size );
virtual bool AcceptsFocus() const { return false; }
private:
wxGrid *m_owner;
void OnMouseEvent( wxMouseEvent& event );
void OnMouseWheel( wxMouseEvent& event );
void OnKeyDown( wxKeyEvent& event );
@@ -221,12 +244,11 @@ private:
DECLARE_NO_COPY_CLASS(wxGridCornerLabelWindow)
};
class WXDLLIMPEXP_ADV wxGridWindow : public wxWindow
class WXDLLIMPEXP_ADV wxGridWindow : public wxGridSubwindow
{
public:
wxGridWindow()
{
m_owner = NULL;
m_rowLabelWin = NULL;
m_colLabelWin = NULL;
}
@@ -235,14 +257,10 @@ public:
wxGridRowLabelWindow *rowLblWin,
wxGridColLabelWindow *colLblWin,
wxWindowID id, const wxPoint &pos, const wxSize &size );
virtual ~wxGridWindow() {}
void ScrollWindow( int dx, int dy, const wxRect *rect );
wxGrid* GetOwner() { return m_owner; }
private:
wxGrid *m_owner;
wxGridRowLabelWindow *m_rowLabelWin;
wxGridColLabelWindow *m_colLabelWin;
@@ -3837,9 +3855,18 @@ void wxGridStringTable::SetColLabelValue( int col, const wxString& value )
//////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE(wxGridSubwindow, wxWindow)
EVT_MOUSE_CAPTURE_LOST(wxGridSubwindow::OnMouseCaptureLost)
END_EVENT_TABLE()
void wxGridSubwindow::OnMouseCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(event))
{
m_owner->CancelMouseCapture();
}
IMPLEMENT_DYNAMIC_CLASS( wxGridRowLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridRowLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridRowLabelWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridRowLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridRowLabelWindow::OnMouseEvent )
@@ -3851,7 +3878,7 @@ END_EVENT_TABLE()
wxGridRowLabelWindow::wxGridRowLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
: wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
@@ -3910,7 +3937,7 @@ void wxGridRowLabelWindow::OnChar( wxKeyEvent& event )
IMPLEMENT_DYNAMIC_CLASS( wxGridColLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridColLabelWindow, wxGridSubwindow )
EVT_PAINT( wxGridColLabelWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridColLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridColLabelWindow::OnMouseEvent )
@@ -3922,7 +3949,7 @@ END_EVENT_TABLE()
wxGridColLabelWindow::wxGridColLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
: wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
@@ -3984,7 +4011,7 @@ void wxGridColLabelWindow::OnChar( wxKeyEvent& event )
IMPLEMENT_DYNAMIC_CLASS( wxGridCornerLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridCornerLabelWindow, wxGridSubwindow )
EVT_MOUSEWHEEL( wxGridCornerLabelWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridCornerLabelWindow::OnMouseEvent )
EVT_PAINT( wxGridCornerLabelWindow::OnPaint )
@@ -3996,7 +4023,7 @@ END_EVENT_TABLE()
wxGridCornerLabelWindow::wxGridCornerLabelWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos, const wxSize &size )
: wxWindow( parent, id, pos, size, wxWANTS_CHARS | wxBORDER_NONE | wxFULL_REPAINT_ON_RESIZE )
: wxGridSubwindow(parent, id, pos, size)
{
m_owner = parent;
}
@@ -4067,7 +4094,7 @@ void wxGridCornerLabelWindow::OnChar( wxKeyEvent& event )
IMPLEMENT_DYNAMIC_CLASS( wxGridWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridWindow, wxWindow )
BEGIN_EVENT_TABLE( wxGridWindow, wxGridSubwindow )
EVT_PAINT( wxGridWindow::OnPaint )
EVT_MOUSEWHEEL( wxGridWindow::OnMouseWheel )
EVT_MOUSE_EVENTS( wxGridWindow::OnMouseEvent )
@@ -4085,10 +4112,8 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
wxWindowID id,
const wxPoint &pos,
const wxSize &size )
: wxWindow(
parent, id, pos, size,
wxWANTS_CHARS | wxBORDER_NONE | wxCLIP_CHILDREN | wxFULL_REPAINT_ON_RESIZE,
wxT("grid window") )
: wxGridSubwindow(parent, id, pos, size,
wxCLIP_CHILDREN, wxT("grid window") )
{
m_owner = parent;
m_rowLabelWin = rowLblWin;
@@ -5946,6 +5971,21 @@ void wxGrid::ProcessCornerLabelMouseEvent( wxMouseEvent& event )
}
}
void wxGrid::CancelMouseCapture()
{
// cancel operation currently in progress, whatever it is
if ( m_winCapture )
{
m_isDragging = false;
m_cursorMode = WXGRID_CURSOR_SELECT_CELL;
m_winCapture->SetCursor( *wxSTANDARD_CURSOR );
m_winCapture = NULL;
// remove traces of whatever we drew on screen
Refresh();
}
}
void wxGrid::ChangeCursorMode(CursorMode mode,
wxWindow *win,
bool captureMouse)

1
version-script.in
View File

@@ -27,6 +27,7 @@
@WX_VERSION_TAG@.12 {
*wxDataViewListModel*GetValueByRow*;
*wxDataViewListModel*SetValueByRow*;
*wxGrid*CancelMouseCapture*;
};
# public symbols added in 2.8.11 (please keep in alphabetical order):