From 4d7a6aea0822c02274accfcecb2ff2f1566f6dcf Mon Sep 17 00:00:00 2001 From: Igor Velikorossov Date: Wed, 27 Nov 2019 12:07:07 +1100 Subject: [PATCH] Remove remnants of `ToolBar` class `ToolBar` implementation was removed in #2157. Closes #2372 --- .../Interop/ComCtl32/Interop.NMTOOLBARW.cs | 21 ---------- .../src/Interop/ComCtl32/Interop.TBBUTTON.cs | 23 ----------- .../Interop/ComCtl32/Interop.TBBUTTONINFOW.cs | 25 ------------ .../src/Interop/ComCtl32/Interop.TBIF.cs | 24 ------------ .../src/Interop/ComCtl32/Interop.TBSTATE.cs | 24 ------------ .../src/Interop/ComCtl32/Interop.TBSTYLE.cs | 38 ------------------- 6 files changed, 155 deletions(-) delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.NMTOOLBARW.cs delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.TBBUTTON.cs delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.TBBUTTONINFOW.cs delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.TBIF.cs delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.TBSTATE.cs delete mode 100644 src/Common/src/Interop/ComCtl32/Interop.TBSTYLE.cs diff --git a/src/Common/src/Interop/ComCtl32/Interop.NMTOOLBARW.cs b/src/Common/src/Interop/ComCtl32/Interop.NMTOOLBARW.cs deleted file mode 100644 index d5980c781ab..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.NMTOOLBARW.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - public unsafe struct NMTOOLBARW - { - public User32.NMHDR hdr; - public int iItem; - public TBBUTTON tbButton; - public int cchText; - public char* pszText; - public RECT rcButton; - } - } -} diff --git a/src/Common/src/Interop/ComCtl32/Interop.TBBUTTON.cs b/src/Common/src/Interop/ComCtl32/Interop.TBBUTTON.cs deleted file mode 100644 index 490042e79b0..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.TBBUTTON.cs +++ /dev/null @@ -1,23 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - public struct TBBUTTON - { - public int iBitmap; - public int idCommand; - public TBSTATE fsState; - public byte fsStyle; - public byte bReserved0; - public byte bReserved1; - public IntPtr dwData; - public IntPtr iString; - } - } -} diff --git a/src/Common/src/Interop/ComCtl32/Interop.TBBUTTONINFOW.cs b/src/Common/src/Interop/ComCtl32/Interop.TBBUTTONINFOW.cs deleted file mode 100644 index 0b02f5e406c..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.TBBUTTONINFOW.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - public struct TBBUTTONINFOW - { - public uint cbSize; - public TBIF dwMask; - public int idCommand; - public int iImage; - public TBSTATE fsState; - public byte fsStyle; - public ushort cx; - public IntPtr lParam; - public IntPtr pszText; - public int cchTest; - } - } -} diff --git a/src/Common/src/Interop/ComCtl32/Interop.TBIF.cs b/src/Common/src/Interop/ComCtl32/Interop.TBIF.cs deleted file mode 100644 index 66d780b6f1c..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.TBIF.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - [Flags] - public enum TBIF : uint - { - IMAGE = 0x00000001, - TEXT = 0x00000002, - STATE = 0x00000004, - STYLE = 0x00000008, - LPARAM = 0x00000010, - COMMAND = 0x00000020, - SIZE = 0x00000040, - BYINDEX = 0x80000000, - } - } -} diff --git a/src/Common/src/Interop/ComCtl32/Interop.TBSTATE.cs b/src/Common/src/Interop/ComCtl32/Interop.TBSTATE.cs deleted file mode 100644 index 13bff64c4b8..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.TBSTATE.cs +++ /dev/null @@ -1,24 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - [Flags] - public enum TBSTATE : byte - { - CHECKED = 0x01, - PRESSED = 0x02, - ENABLED = 0x04, - HIDDEN = 0x08, - INDETERMINATE = 0x10, - WRAP = 0x20, - ELLIPSES = 0x40, - MARKED = 0x80, - } - } -} diff --git a/src/Common/src/Interop/ComCtl32/Interop.TBSTYLE.cs b/src/Common/src/Interop/ComCtl32/Interop.TBSTYLE.cs deleted file mode 100644 index d8f6f48af5f..00000000000 --- a/src/Common/src/Interop/ComCtl32/Interop.TBSTYLE.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - -using System; - -internal static partial class Interop -{ - internal static partial class ComCtl32 - { - [Flags] - public enum TBSTYLE : int - { - BUTTON = 0x0000, - SEP = 0x0001, - CHECK = 0x0002, - GROUP = 0x0004, - CHECKGROUP = GROUP, - DROPDOWN = 0x0008, - AUTOSIZE = 0x0010, - NOPREFIX = 0x0020, - TOOLTIPS = 0x0100, - WRAPABLE = 0x0200, - ALTDRAG = 0x0400, - FLAT = 0x0800, - LIST = 0x1000, - CUSTOMERASE = 0x2000, - REGISTERDROP = 0x4000, - TRANSPARENT = 0x800, - EX_DRAWDDARROWS = 0x00000001, - EX_MIXEDBUTTONS = 0x00000008, - EX_HIDECLIPPEDBUTTONS = 0x00000010, - EX_MULTICOLUMN = 0x00000002, - EX_VERTICAL = 0x00000004, - EX_DOUBLEBUFFER = 0x00000080, - } - } -}