refactor: remove unused native methods

Remove unused GetWindowText and GetWindowBoundingRectangle methods.
batzen · Dec 10, 2023 · 6fc16f3 · 6fc16f3
1 parent 28bf413
commit 6fc16f3
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 65 deletions.
diff --git a/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs b/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs
@@ -12,6 +12,7 @@
 using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.UI.WindowsAndMessaging;
 using MahApps.Metro.Controls;
+using MahApps.Metro.Native;
 using Microsoft.Xaml.Behaviors;
 
 namespace MahApps.Metro.Behaviors

diff --git a/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs b/src/MahApps.Metro/Controls/Dialogs/DialogManager.cs
@@ -8,6 +8,7 @@
 using System.Windows;
 using System.Windows.Controls;
 using ControlzEx.Theming;
+using MahApps.Metro.Native;
 using MahApps.Metro.ValueBoxes;
 
 namespace MahApps.Metro.Controls.Dialogs

diff --git a/src/MahApps.Metro/Controls/WindowButtonCommands.cs b/src/MahApps.Metro/Controls/WindowButtonCommands.cs
@@ -7,6 +7,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
+using MahApps.Metro.Native;
 
 namespace MahApps.Metro.Controls
 {

diff --git a/...hApps.Metro/Internal/PInvokeExtensions.cs → ...MahApps.Metro/Native/PInvokeExtensions.cs b/...hApps.Metro/Internal/PInvokeExtensions.cs → ...MahApps.Metro/Native/PInvokeExtensions.cs
diff --git a/src/MahApps.Metro/Controls/WinApiHelper.cs → src/MahApps.Metro/Native/WinApiHelper.cs b/src/MahApps.Metro/Controls/WinApiHelper.cs → src/MahApps.Metro/Native/WinApiHelper.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -15,7 +14,7 @@
 using Windows.Win32.Graphics.Gdi;
 using Windows.Win32.UI.WindowsAndMessaging;
 
-namespace MahApps.Metro.Controls
+namespace MahApps.Metro.Native
 {
     internal static class WinApiHelper
     {
@@ -132,66 +131,5 @@ private static int CalcIntValue(double? value, double fallback)
 
             return (int)fallback;
         }
-
-        /// <summary> Gets the text associated with the given window handle. </summary>
-        /// <param name="window"> The window to act on. </param>
-        /// <returns> The window text. </returns>
-        internal static string? GetWindowText(this Window? window)
-        {
-            if (window is null == false
-                && PresentationSource.FromVisual(window) is HwndSource source
-                && source.IsDisposed == false
-                && source.RootVisual is null == false
-                && source.Handle != IntPtr.Zero)
-            {
-                int bufferSize = PInvoke.GetWindowTextLength(new HWND(source.Handle)) + 1;
-                unsafe
-                {
-                    fixed (char* windowNameChars = new char[bufferSize])
-                    {
-                        PInvoke.GetWindowText(new HWND(source.Handle), windowNameChars, bufferSize);
-                        return new string(windowNameChars);
-                    }
-                }
-            }
-
-            return default;
-        }
-
-        /// <summary> Gets the text associated with the given window handle. </summary>
-        /// <param name="window"> The window to act on. </param>
-        /// <returns> The window text. </returns>
-        internal static Rect GetWindowBoundingRectangle(this Window? window)
-        {
-            var bounds = new Rect(0, 0, 0, 0);
-
-            if (window is null == false
-                && PresentationSource.FromVisual(window) is HwndSource source
-                && source.IsDisposed == false
-                && source.RootVisual is null == false
-                && source.Handle != IntPtr.Zero)
-            {
-                var rc = new RECT();
-
-                try
-                {
-                    unsafe
-                    {
-                        PInvoke.GetWindowRect((HWND)source.Handle, &rc);
-                    }
-                }
-                // Allow empty catch statements.
-#pragma warning disable 56502
-                catch (Win32Exception)
-                {
-                }
-                // Disallow empty catch statements.
-#pragma warning restore 56502
-
-                bounds = new Rect(rc.left, rc.top, rc.GetWidth(), rc.GetHeight());
-            }
-
-            return bounds;
-        }
     }
 }
diff --git a/src/MahApps.Metro/NativeMethods.txt b/src/MahApps.Metro/NativeMethods.txt
@@ -2,8 +2,6 @@ GetKeyNameText
 GetMonitorInfo
 GetWindowPlacement
 GetWindowRect
-GetWindowText
-GetWindowTextLength
 LoadLibrary
 LoadString
 MapVirtualKey