Skip to content
This repository was archived by the owner on Jan 13, 2024. It is now read-only.

Commit 5572c2f

Browse files
committed
Merge branch 'bugfix/NPP_DOCORDERCHANGED'
2 parents aecdcd2 + 9685315 commit 5572c2f

File tree

14 files changed

+243
-2497
lines changed

14 files changed

+243
-2497
lines changed

Demo Plugin/CopyPluginToNpp.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
copy /B "C:\src\NotepadPlusPlusPluginPack.Net\Demo Plugin\NppManagedPluginDemo\bin\Debug\Demo.dll" "C:\Program Files (x86)\Notepad++\plugins\"
2+

Demo Plugin/NppManagedPluginDemo/Demo.cs

Lines changed: 121 additions & 92 deletions
Large diffs are not rendered by default.

Demo Plugin/NppManagedPluginDemo/DllExport/DllExportAttribute.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

Demo Plugin/NppManagedPluginDemo/Forms/frmGoToLine.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System;
22
using System.Windows.Forms;
3+
using Kbg.NppPluginNET;
34

4-
namespace NppPluginNET
5+
namespace Kbg.Demo.Namespace
56
{
6-
partial class frmGoToLine : Form
7+
partial class frmGoToLine : Form
78
{
89
public frmGoToLine()
910
{
@@ -53,7 +54,7 @@ void FrmGoToLineVisibleChanged(object sender, EventArgs e)
5354
if (!Visible)
5455
{
5556
Win32.SendMessage(PluginBase.nppData._nppHandle, NppMsg.NPPM_SETMENUITEMCHECK,
56-
PluginBase._funcItems.Items[PluginBase.idFrmGotToLine]._cmdID, 0);
57+
PluginBase._funcItems.Items[Main.idFrmGotToLine]._cmdID, 0);
5758
}
5859
}
5960
}

Demo Plugin/NppManagedPluginDemo/Forms/frmGoToLine.designer.cs

Lines changed: 84 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Demo Plugin/NppManagedPluginDemo/NppManagedPluginDemo.VS2015.csproj

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,29 @@
4545
<Prefer32Bit>false</Prefer32Bit>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Compile Include="DllExport\DllExportAttribute.cs" />
48+
<Compile Include="..\..\Visual Studio Project Template C#\DllExport\DllExportAttribute.cs">
49+
<Link>DllExport\DllExportAttribute.cs</Link>
50+
</Compile>
51+
<Compile Include="..\..\Visual Studio Project Template C#\NppPluginNETBase.cs">
52+
<Link>NppPluginNETBase.cs</Link>
53+
</Compile>
54+
<Compile Include="..\..\Visual Studio Project Template C#\NppPluginNETHelper.cs">
55+
<Link>NppPluginNETHelper.cs</Link>
56+
</Compile>
57+
<Compile Include="..\..\Visual Studio Project Template C#\UnmanagedExports.cs">
58+
<Link>UnmanagedExports.cs</Link>
59+
</Compile>
4960
<Compile Include="Forms\frmGoToLine.cs">
5061
<SubType>Form</SubType>
5162
</Compile>
5263
<Compile Include="Forms\frmGoToLine.designer.cs">
5364
<DependentUpon>frmGoToLine.cs</DependentUpon>
5465
</Compile>
5566
<Compile Include="Demo.cs" />
56-
<Compile Include="NppPluginNETBase.cs" />
57-
<Compile Include="NppPluginNETHelper.cs" />
5867
<Compile Include="Properties\AssemblyInfo.cs" />
5968
<Compile Include="Properties\Resources.Designer.cs">
6069
<DependentUpon>Resources.resx</DependentUpon>
6170
</Compile>
62-
<Compile Include="UnmanagedExports.cs" />
6371
</ItemGroup>
6472
<ItemGroup>
6573
<Reference Include="System" />

Demo Plugin/NppManagedPluginDemo/NppPluginNETBase.cs

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)