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

Refactor event sending code in wxGrid to use even more functions

Browse Source 
Move the logic determining the return value of SendEvent() into its own
function instead of repeating it twice.

No real changes, this is a pure refactoring.
This commit is contained in:
Vadim Zeitlin
2020-05-02 00:47:43 +02:00
parent f938402dd0
commit 5cdcfddc61
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/generic/grid.cpp
View File

@@ -5293,16 +5293,27 @@ wxGrid::SendGridSizeEvent(wxEventType type,
return GetEventHandler()->ProcessEvent(gridEvt);
}
// Generate a grid event based on a mouse event and return:
// Process the event and return
// -1 if the event was vetoed
// +1 if the event was processed (but not vetoed)
// 0 if the event wasn't handled
int wxGrid::DoSendEvent(wxGridEvent& gridEvt)
{
const bool claimed = GetEventHandler()->ProcessEvent(gridEvt);
// A Veto'd event may not be `claimed' so test this first
if ( !gridEvt.IsAllowed() )
return -1;
return claimed ? 1 : 0;
}
// Generate a grid event based on a mouse event and call DoSendEvent() with it.
int
wxGrid::SendEvent(wxEventType type,
int row, int col,
const wxMouseEvent& mouseEv)
{
bool claimed, vetoed;
if ( type == wxEVT_GRID_LABEL_LEFT_CLICK ||
type == wxEVT_GRID_LABEL_LEFT_DCLICK ||
@@ -5324,8 +5335,8 @@ wxGrid::SendEvent(wxEventType type,
pos.y,
false,
mouseEv);
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
return DoSendEvent(gridEvt);
}
else
{
@@ -5345,15 +5356,8 @@ wxGrid::SendEvent(wxEventType type,
gridEvt.Veto();
}
claimed = GetEventHandler()->ProcessEvent(gridEvt);
vetoed = !gridEvt.IsAllowed();
return DoSendEvent(gridEvt);
}
// A Veto'd event may not be `claimed' so test this first
if (vetoed)
return -1;
return claimed ? 1 : 0;
}
// Generate a grid event of specified type, return value same as above
@@ -5364,13 +5368,7 @@ wxGrid::SendEvent(wxEventType type, int row, int col, const wxString& s)
wxGridEvent gridEvt( GetId(), type, this, row, col );
gridEvt.SetString(s);
const bool claimed = GetEventHandler()->ProcessEvent(gridEvt);
// A Veto'd event may not be `claimed' so test this first
if ( !gridEvt.IsAllowed() )
return -1;
return claimed ? 1 : 0;
return DoSendEvent(gridEvt);
}
void wxGrid::Refresh(bool eraseb, const wxRect* rect)