#5127: Add a separate ui::MenuItem for separator elements

codereader · Jan 3, 2021 · 8f66a35 · 8f66a35
1 parent e27bf33
commit 8f66a35
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 1 deletion.
diff --git a/libs/wxutil/menu/PopupMenu.cpp b/libs/wxutil/menu/PopupMenu.cpp
@@ -1,4 +1,5 @@
 #include "PopupMenu.h"
+#include "SeparatorItem.h"
 
 namespace wxutil
 {
@@ -34,7 +35,9 @@ void PopupMenu::addItem(const ui::IMenuItemPtr& item)
 
 void PopupMenu::addSeparator()
 {
-	AppendSeparator();
+    addItem(std::make_shared<SeparatorItem>(
+        new wxMenuItem(this, wxID_ANY, wxEmptyString, wxEmptyString, wxITEM_SEPARATOR))
+    );
 }
 
 void PopupMenu::show(wxWindow* parent)

diff --git a/libs/wxutil/menu/SeparatorItem.h b/libs/wxutil/menu/SeparatorItem.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "imenu.h"
+
+#include <wx/menuitem.h>
+
+namespace wxutil
+{
+
+// Represents a separator item
+class SeparatorItem final :
+    public ui::IMenuItem
+{
+protected:
+    wxMenuItem* _menuItem;
+    ui::IMenu::VisibilityTest _visibilityTest;
+
+public:
+    SeparatorItem(wxMenuItem* menuItem, const ui::IMenu::VisibilityTest& visTest = AlwaysVisible) : 
+        _menuItem(menuItem),
+        _visibilityTest(visTest)
+    {}
+
+    wxMenuItem* getMenuItem() override
+    {
+        return _menuItem;
+    }
+
+    void execute() override
+    {}
+
+    bool isVisible() override
+    {
+        return _visibilityTest();
+    }
+
+    static bool AlwaysVisible() { return true; }
+};
+
+} // namespace
diff --git a/tools/msvc/wxutillib.vcxproj b/tools/msvc/wxutillib.vcxproj
@@ -171,6 +171,7 @@
     <ClInclude Include="..\..\libs\wxutil\menu\IconTextMenuItem.h" />
     <ClInclude Include="..\..\libs\wxutil\menu\MenuItem.h" />
     <ClInclude Include="..\..\libs\wxutil\menu\PopupMenu.h" />
+    <ClInclude Include="..\..\libs\wxutil\menu\SeparatorItem.h" />
     <ClInclude Include="..\..\libs\wxutil\ModalProgressDialog.h" />
     <ClInclude Include="..\..\libs\wxutil\Modifier.h" />
     <ClInclude Include="..\..\libs\wxutil\MouseButton.h" />

diff --git a/tools/msvc/wxutillib.vcxproj.filters b/tools/msvc/wxutillib.vcxproj.filters
@@ -139,6 +139,9 @@
     <ClInclude Include="..\..\libs\wxutil\dataview\ThreadedResourceTreePopulator.h">
       <Filter>dataview</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\libs\wxutil\menu\SeparatorItem.h">
+      <Filter>menu</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\libs\wxutil\dialog\MessageBox.cpp">