From c686b86e38bb0cf498ea53a77887af68ac49e9cb Mon Sep 17 00:00:00 2001 From: Nathan Randle Date: Wed, 17 Mar 2021 23:12:15 +0000 Subject: [PATCH] Rename misspellings of separator. --- native/Avalonia.Native/src/OSX/common.h | 2 +- native/Avalonia.Native/src/OSX/main.mm | 4 ++-- native/Avalonia.Native/src/OSX/menu.h | 4 ++-- native/Avalonia.Native/src/OSX/menu.mm | 8 ++++---- samples/ControlCatalog/MainWindow.xaml | 4 ++-- src/Avalonia.Controls/NativeMenuItemSeparator.cs | 16 ++++++++++++++++ src/Avalonia.Controls/NativeMenuItemSeperator.cs | 10 ---------- src/Avalonia.FreeDesktop/DBusMenuExporter.cs | 2 +- src/Avalonia.Native/IAvnMenu.cs | 4 ++-- src/Avalonia.Native/avn.idl | 2 +- 10 files changed, 31 insertions(+), 25 deletions(-) create mode 100644 src/Avalonia.Controls/NativeMenuItemSeparator.cs delete mode 100644 src/Avalonia.Controls/NativeMenuItemSeperator.cs diff --git a/native/Avalonia.Native/src/OSX/common.h b/native/Avalonia.Native/src/OSX/common.h index 0f7215f37c..c082003ccf 100644 --- a/native/Avalonia.Native/src/OSX/common.h +++ b/native/Avalonia.Native/src/OSX/common.h @@ -23,7 +23,7 @@ extern IAvnCursorFactory* CreateCursorFactory(); extern IAvnGlDisplay* GetGlDisplay(); extern IAvnMenu* CreateAppMenu(IAvnMenuEvents* events); extern IAvnMenuItem* CreateAppMenuItem(); -extern IAvnMenuItem* CreateAppMenuItemSeperator(); +extern IAvnMenuItem* CreateAppMenuItemSeparator(); extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent); extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu); extern IAvnMenu* GetAppMenu (); diff --git a/native/Avalonia.Native/src/OSX/main.mm b/native/Avalonia.Native/src/OSX/main.mm index 11742e3b5c..aaaf381b26 100644 --- a/native/Avalonia.Native/src/OSX/main.mm +++ b/native/Avalonia.Native/src/OSX/main.mm @@ -253,9 +253,9 @@ public: return S_OK; } - virtual HRESULT CreateMenuItemSeperator (IAvnMenuItem** ppv) override + virtual HRESULT CreateMenuItemSeparator (IAvnMenuItem** ppv) override { - *ppv = ::CreateAppMenuItemSeperator(); + *ppv = ::CreateAppMenuItemSeparator(); return S_OK; } diff --git a/native/Avalonia.Native/src/OSX/menu.h b/native/Avalonia.Native/src/OSX/menu.h index 564fdc132b..4a9348d17b 100644 --- a/native/Avalonia.Native/src/OSX/menu.h +++ b/native/Avalonia.Native/src/OSX/menu.h @@ -31,13 +31,13 @@ private: NSMenuItem* _native; // here we hold a pointer to an AvnMenuItem IAvnActionCallback* _callback; IAvnPredicateCallback* _predicate; - bool _isSeperator; + bool _isSeparator; bool _isCheckable; public: FORWARD_IUNKNOWN() - AvnAppMenuItem(bool isSeperator); + AvnAppMenuItem(bool isSeparator); NSMenuItem* GetNative(); diff --git a/native/Avalonia.Native/src/OSX/menu.mm b/native/Avalonia.Native/src/OSX/menu.mm index ea5cca9ce8..02b6365a8c 100644 --- a/native/Avalonia.Native/src/OSX/menu.mm +++ b/native/Avalonia.Native/src/OSX/menu.mm @@ -71,12 +71,12 @@ } @end -AvnAppMenuItem::AvnAppMenuItem(bool isSeperator) +AvnAppMenuItem::AvnAppMenuItem(bool isSeparator) { _isCheckable = false; - _isSeperator = isSeperator; + _isSeparator = isSeparator; - if(isSeperator) + if(isSeparator) { _native = [NSMenuItem separatorItem]; } @@ -401,7 +401,7 @@ extern IAvnMenuItem* CreateAppMenuItem() } } -extern IAvnMenuItem* CreateAppMenuItemSeperator() +extern IAvnMenuItem* CreateAppMenuItemSeparator() { @autoreleasepool { diff --git a/samples/ControlCatalog/MainWindow.xaml b/samples/ControlCatalog/MainWindow.xaml index 6a70bb082f..a107ee2163 100644 --- a/samples/ControlCatalog/MainWindow.xaml +++ b/samples/ControlCatalog/MainWindow.xaml @@ -18,11 +18,11 @@ - + - + diff --git a/src/Avalonia.Controls/NativeMenuItemSeparator.cs b/src/Avalonia.Controls/NativeMenuItemSeparator.cs new file mode 100644 index 0000000000..d3d3721c89 --- /dev/null +++ b/src/Avalonia.Controls/NativeMenuItemSeparator.cs @@ -0,0 +1,16 @@ +using System; + +namespace Avalonia.Controls +{ + + [Obsolete("This class exists to maintain backwards compatiblity with existing code. Use NativeMenuItemSeparator instead")] + public class NativeMenuItemSeperator : NativeMenuItemSeparator + { + } + + public class NativeMenuItemSeparator : NativeMenuItemBase + { + [Obsolete("This is a temporary hack to make our MenuItem recognize this as a separator, don't use", true)] + public string Header => "-"; + } +} diff --git a/src/Avalonia.Controls/NativeMenuItemSeperator.cs b/src/Avalonia.Controls/NativeMenuItemSeperator.cs deleted file mode 100644 index e743483dab..0000000000 --- a/src/Avalonia.Controls/NativeMenuItemSeperator.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System; - -namespace Avalonia.Controls -{ - public class NativeMenuItemSeperator : NativeMenuItemBase - { - [Obsolete("This is a temporary hack to make our MenuItem recognize this as a separator, don't use", true)] - public string Header => "-"; - } -} diff --git a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs index 2cf533195e..9e635e01f1 100644 --- a/src/Avalonia.FreeDesktop/DBusMenuExporter.cs +++ b/src/Avalonia.FreeDesktop/DBusMenuExporter.cs @@ -192,7 +192,7 @@ namespace Avalonia.FreeDesktop { var (it, menu) = i; - if (it is NativeMenuItemSeperator) + if (it is NativeMenuItemSeparator) { if (name == "type") return "separator"; diff --git a/src/Avalonia.Native/IAvnMenu.cs b/src/Avalonia.Native/IAvnMenu.cs index dd9464284f..d08388c49e 100644 --- a/src/Avalonia.Native/IAvnMenu.cs +++ b/src/Avalonia.Native/IAvnMenu.cs @@ -103,8 +103,8 @@ namespace Avalonia.Native.Interop.Impl private __MicroComIAvnMenuItemProxy CreateNew(IAvaloniaNativeFactory factory, NativeMenuItemBase item) { - var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeperator ? - factory.CreateMenuItemSeperator() : + var nativeItem = (__MicroComIAvnMenuItemProxy)(item is NativeMenuItemSeparator ? + factory.CreateMenuItemSeparator() : factory.CreateMenuItem()); nativeItem.ManagedMenuItem = item; diff --git a/src/Avalonia.Native/avn.idl b/src/Avalonia.Native/avn.idl index 2693f5f139..3f485dd375 100644 --- a/src/Avalonia.Native/avn.idl +++ b/src/Avalonia.Native/avn.idl @@ -417,7 +417,7 @@ interface IAvaloniaNativeFactory : IUnknown HRESULT SetAppMenu(IAvnMenu* menu); HRESULT CreateMenu(IAvnMenuEvents* cb, IAvnMenu** ppv); HRESULT CreateMenuItem(IAvnMenuItem** ppv); - HRESULT CreateMenuItemSeperator(IAvnMenuItem** ppv); + HRESULT CreateMenuItemSeparator(IAvnMenuItem** ppv); } [uuid(233e094f-9b9f-44a3-9a6e-6948bbdd9fb1)]