Changed ButtonEventHandler to EventHandler
Made lock disable the selection widget but be more inteligent about re-enabling it after unlock
This commit is contained in:
parent
e3ba5f3ea7
commit
222a5a46a7
49 changed files with 343 additions and 263 deletions
|
|
@ -101,7 +101,7 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
|
||||
Button addMacroButton = textImageButtonFactory.Generate(LocalizedString.Get("Save"));
|
||||
addMacroButton.Click += new ButtonBase.ButtonEventHandler(saveMacro_Click);
|
||||
addMacroButton.Click += new EventHandler(saveMacro_Click);
|
||||
|
||||
Button cancelPresetsButton = textImageButtonFactory.Generate(LocalizedString.Get("Cancel"));
|
||||
cancelPresetsButton.Click += (sender, e) =>
|
||||
|
|
@ -227,7 +227,7 @@ namespace MatterHackers.MatterControl
|
|||
}
|
||||
}
|
||||
|
||||
void saveMacro_Click(object sender, MouseEventArgs mouseEvent)
|
||||
void saveMacro_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
UiThread.RunOnIdle((state) =>
|
||||
{
|
||||
|
|
@ -334,7 +334,7 @@ namespace MatterHackers.MatterControl
|
|||
|
||||
|
||||
Button addMacroButton = textImageButtonFactory.Generate(LocalizedString.Get("Add"), "icon_circle_plus.png");
|
||||
addMacroButton.Click += new ButtonBase.ButtonEventHandler(addMacro_Click);
|
||||
addMacroButton.Click += new EventHandler(addMacro_Click);
|
||||
|
||||
Button cancelPresetsButton = textImageButtonFactory.Generate(LocalizedString.Get("Close"));
|
||||
cancelPresetsButton.Click += (sender, e) => {
|
||||
|
|
@ -373,7 +373,7 @@ namespace MatterHackers.MatterControl
|
|||
return results;
|
||||
}
|
||||
|
||||
void addMacro_Click(object sender, MouseEventArgs mouseEvent)
|
||||
void addMacro_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
windowController.ChangeToMacroDetail();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue