renamed events OnSelect to OnSelectBegin and OnEdit to OnEditBegin for naming consistency

This commit is contained in:
codeimp 2008-10-08 14:19:09 +00:00
parent 53ff1e1fa1
commit 8b6a6754ab
9 changed files with 32 additions and 32 deletions

View file

@ -538,7 +538,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Selecting with mouse // Selecting with mouse
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Not modifying? // Not modifying?
if(mode == ModifyMode.None) if(mode == ModifyMode.None)
@ -565,7 +565,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
} }
base.OnSelect(); base.OnSelectBegin();
} }
// End selection // End selection
@ -657,9 +657,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
// Editing // Editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
base.OnEdit(); base.OnEditBegin();
// No selection? // No selection?
if(orderedselection.Count == 0) if(orderedselection.Count == 0)

View file

@ -939,10 +939,10 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// When edit button is pressed // When edit button is pressed
protected override void OnEdit() protected override void OnEditBegin()
{ {
base.OnEdit(); base.OnEditBegin();
OnSelect(); OnSelectBegin();
} }
// When edit button is released // When edit button is released
@ -953,9 +953,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// When select button is pressed // When select button is pressed
protected override void OnSelect() protected override void OnSelectBegin()
{ {
base.OnSelect(); base.OnSelectBegin();
// Used in many cases: // Used in many cases:
Vector2D center = offset + size * 0.5f; Vector2D center = offset + size * 0.5f;

View file

@ -254,7 +254,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Selection // Selection
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -279,7 +279,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
StartMultiSelection(); StartMultiSelection();
} }
base.OnSelect(); base.OnSelectBegin();
} }
// End selection // End selection
@ -308,7 +308,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start editing // Start editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -344,7 +344,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Map.ChangeMode(drawmode); General.Map.ChangeMode(drawmode);
} }
base.OnEdit(); base.OnEditBegin();
} }
// Done editing // Done editing

View file

@ -193,12 +193,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start select // Start select
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Select pressed in this mode // Select pressed in this mode
selectpressed = true; selectpressed = true;
editside = nearestside; editside = nearestside;
base.OnEdit(); base.OnEditBegin();
} }
#endregion #endregion
@ -313,12 +313,12 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start editing // Start editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
// Edit pressed in this mode // Edit pressed in this mode
editpressed = true; editpressed = true;
editside = nearestside; editside = nearestside;
base.OnEdit(); base.OnEditBegin();
} }
// Done editing // Done editing

View file

@ -344,7 +344,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Selection // Selection
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -367,7 +367,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
StartMultiSelection(); StartMultiSelection();
} }
base.OnSelect(); base.OnSelectBegin();
} }
// End selection // End selection
@ -394,7 +394,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start editing // Start editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -429,7 +429,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
General.Map.ChangeMode(drawmode); General.Map.ChangeMode(drawmode);
} }
base.OnEdit(); base.OnEditBegin();
} }
// Done editing // Done editing

View file

@ -246,7 +246,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Selection // Selection
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -269,7 +269,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
StartMultiSelection(); StartMultiSelection();
} }
base.OnSelect(); base.OnSelectBegin();
} }
// End selection // End selection
@ -296,7 +296,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start editing // Start editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -323,7 +323,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
} }
base.OnEdit(); base.OnEditBegin();
} }
// Done editing // Done editing

View file

@ -185,7 +185,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Selection // Selection
protected override void OnSelect() protected override void OnSelectBegin()
{ {
// Item highlighted? // Item highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -207,7 +207,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
StartMultiSelection(); StartMultiSelection();
} }
base.OnSelect(); base.OnSelectBegin();
} }
// End selection // End selection
@ -233,7 +233,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
// Start editing // Start editing
protected override void OnEdit() protected override void OnEditBegin()
{ {
// Vertex highlighted? // Vertex highlighted?
if((highlighted != null) && !highlighted.IsDisposed) if((highlighted != null) && !highlighted.IsDisposed)
@ -277,7 +277,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
} }
} }
base.OnEdit(); base.OnEditBegin();
} }
// Done editing // Done editing

View file

@ -438,7 +438,7 @@ namespace CodeImp.DoomBuilder.Editing
/// (in Doom Builder 1, this was always the right mousebutton) /// (in Doom Builder 1, this was always the right mousebutton)
/// </summary> /// </summary>
[BeginAction("classicedit", BaseAction = true)] [BeginAction("classicedit", BaseAction = true)]
protected virtual void OnEdit() protected virtual void OnEditBegin()
{ {
} }
@ -456,7 +456,7 @@ namespace CodeImp.DoomBuilder.Editing
/// (in Doom Builder 1, this was always the left mousebutton) /// (in Doom Builder 1, this was always the left mousebutton)
/// </summary> /// </summary>
[BeginAction("classicselect", BaseAction = true)] [BeginAction("classicselect", BaseAction = true)]
protected virtual void OnSelect() protected virtual void OnSelectBegin()
{ {
} }

View file

@ -134,7 +134,7 @@ namespace CodeImp.DoomBuilder.Editing
#endregion #endregion
#region ================== Methods #region ================== Events
// //
// Order in which events occur for the old and new modes: // Order in which events occur for the old and new modes: