diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs index 69a55d3..3479c87 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs @@ -11,5 +11,5 @@ namespace ProjectElectricLocomotive /// Делегат для передачи объекта-локомотив /// /// - public delegate void LocoDelegate(DrawingLocomotive loco); + public delegate void Action(DrawingLocomotive loco); } diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs index 218c423..9ef3f22 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs @@ -273,6 +273,7 @@ this.panelPastelRed.Name = "panelPastelRed"; this.panelPastelRed.Size = new System.Drawing.Size(40, 40); this.panelPastelRed.TabIndex = 0; + this.panelPastelRed.MouseDown += new System.Windows.Forms.MouseEventHandler(this.PanelColor_MouseDown); // // panelObject // diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs index e2b8330..260d57d 100644 --- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs +++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs @@ -21,13 +21,14 @@ namespace ProjectElectricLocomotive /// /// Событие /// - private event LocoDelegate? EventAddLoco; + + private event Action? EventAddLoco; public FormLocomotiveConfig() { InitializeComponent(); - panelPastelRed.MouseDown += PanelColor_MouseDown; + //panelPastelRed.MouseDown += PanelColor_MouseDown; panelPastelPink.MouseDown += PanelColor_MouseDown; panelPastelOrange.MouseDown += PanelColor_MouseDown; panelPastelYellow.MouseDown += PanelColor_MouseDown; @@ -43,7 +44,7 @@ namespace ProjectElectricLocomotive /// Добавление события /// /// Привязанный метод - public void AddEvent(LocoDelegate ev) + public void AddEvent(Action ev) { if (EventAddLoco == null) {