Browse Source

fix some depreciation warnings in ResourceEditor AddIn

pull/59/merge
Siegfried Pammer 12 years ago
parent
commit
32aa4b092c
  1. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs
  2. 4
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/ClipboardCommands.cs
  3. 5
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs
  4. 3
      src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs

2
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/AddNewFileCommand.cs

@ -29,7 +29,7 @@ namespace ResourceEditor
fdiag.Multiselect = true; fdiag.Multiselect = true;
fdiag.CheckFileExists = true; fdiag.CheckFileExists = true;
if (fdiag.ShowDialog(SD.Workbench.MainWin32Window) == DialogResult.OK) { if (fdiag.ShowDialog(SD.WinForms.MainWin32Window) == DialogResult.OK) {
foreach (string filename in fdiag.FileNames) { foreach (string filename in fdiag.FileNames) {
string oresname = Path.ChangeExtension(Path.GetFileName(filename), null); string oresname = Path.ChangeExtension(Path.GetFileName(filename), null);
if (oresname == "") oresname = "new"; if (oresname == "") oresname = "new";

4
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/ClipboardCommands.cs

@ -3,7 +3,7 @@
using System; using System;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop;
namespace ResourceEditor namespace ResourceEditor
{ {
@ -12,7 +12,7 @@ namespace ResourceEditor
{ {
public override void Run() public override void Run()
{ {
ResourceEditWrapper editor = (ResourceEditWrapper)WorkbenchSingleton.Workbench.ActiveViewContent; ResourceEditWrapper editor = (ResourceEditWrapper)SD.Workbench.ActiveViewContent;
editor.SelectAll(); editor.SelectAll();
} }

5
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/Commands/SaveEntryAsCommand.cs

@ -7,6 +7,7 @@ using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop.Gui;
namespace ResourceEditor namespace ResourceEditor
@ -15,7 +16,7 @@ namespace ResourceEditor
{ {
public override void Run() public override void Run()
{ {
ResourceEditorControl editor = ((ResourceEditWrapper)WorkbenchSingleton.Workbench.ActiveViewContent).ResourceEditor; ResourceEditorControl editor = ((ResourceEditWrapper)SD.Workbench.ActiveViewContent).ResourceEditor;
ResourceList list = editor.ResourceList; ResourceList list = editor.ResourceList;
if(list.SelectedItems.Count != 1) { if(list.SelectedItems.Count != 1) {
@ -48,7 +49,7 @@ namespace ResourceEditor
return; return;
} }
DialogResult dr = sdialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window); DialogResult dr = sdialog.ShowDialog(SD.WinForms.MainWin32Window);
sdialog.Dispose(); sdialog.Dispose();
if (dr != DialogResult.OK) { if (dr != DialogResult.OK) {
return; return;

3
src/AddIns/DisplayBindings/ResourceEditor/Project/Src/ResourceEdit/BitmapView.cs

@ -6,6 +6,7 @@ using System.Drawing;
using System.Windows.Forms; using System.Windows.Forms;
using ICSharpCode.Core; using ICSharpCode.Core;
using ICSharpCode.SharpDevelop;
namespace ResourceEditor namespace ResourceEditor
{ {
@ -38,7 +39,7 @@ namespace ResourceEditor
fileDialog.Filter = "All files (*.*)|*.*"; fileDialog.Filter = "All files (*.*)|*.*";
fileDialog.CheckFileExists = true; fileDialog.CheckFileExists = true;
if(fileDialog.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainWin32Window) == DialogResult.OK) { if(fileDialog.ShowDialog(SD.WinForms.MainWin32Window) == DialogResult.OK) {
try { try {
bitmap = new Bitmap(fileDialog.FileName); bitmap = new Bitmap(fileDialog.FileName);
} catch { } catch {

Loading…
Cancel
Save