include/vcl/builder.hxx | 3 +--
include/vcl/widgetbuilder.hxx | 10 ++--------
vcl/source/window/builder.cxx | 16 ++--------------
3 files changed, 5 insertions(+), 24 deletions(-)
New commits:
commit 3bdcd536db4356d769e84237139710b399968924
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sun Nov 10 20:24:11 2024 +0100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Nov 11 01:49:55 2024 +0100
tdf#130857 VclBuilder: Drop unused "GtkMenuBar" support
The last use of a "GtkMenuBar" object in .ui files
was dropped in
commit 7b4169c9d54c6e90e860141a6ced51464cf102d8
Date: Wed Jun 9 01:56:48 2021 +0530
Implement Interface for Data Providers.
Drop the code handling it, to simplify the existing code
and an upcoming refactoring.
Change-Id: I550c83c6d5d13a5e45dc9332e981bae8b0f0a9a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176357
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 90b297ddb43b..10e908894e85 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -290,8 +290,7 @@ private:
void handleMenuChild(Menu *pParent, xmlreader::XmlReader &reader);
void handleMenuObject(Menu *pParent, xmlreader::XmlReader &reader);
- void handleMenu(xmlreader::XmlReader& reader, vcl::Window* pParent, const
OUString& rID,
- bool bMenuBar) override;
+ void handleMenu(xmlreader::XmlReader& reader, const OUString& rID)
override;
// if bToolbarItem=true, pParent is the ToolBox that the item belongs to,
since there's no widget for the item itself
void applyAtkProperties(vcl::Window* pWindow, const stringmap& rProperties,
diff --git a/include/vcl/widgetbuilder.hxx b/include/vcl/widgetbuilder.hxx
index 1a7e6e608f7f..2b6056cf9c03 100644
--- a/include/vcl/widgetbuilder.hxx
+++ b/include/vcl/widgetbuilder.hxx
@@ -154,12 +154,7 @@ protected:
}
else if (sClass == "GtkMenu")
{
- handleMenu(reader, pParent, sID, false);
- return nullptr;
- }
- else if (sClass == "GtkMenuBar")
- {
- handleMenu(reader, pParent, sID, true);
+ handleMenu(reader, sID);
return nullptr;
}
else if (sClass == "GtkSizeGroup")
@@ -382,8 +377,7 @@ protected:
//
// Until that's done, other subclasses can be used to handle only those
.ui files
// not using the corresponding features (attributes/objects in the .ui
file).
- virtual void handleMenu(xmlreader::XmlReader& /*reader*/, Widget*
/*pParent*/,
- const OUString& /*rID*/, bool /*bMenuBar*/)
+ virtual void handleMenu(xmlreader::XmlReader& /*reader*/, const OUString&
/*rID*/)
{
assert(false && "Functionality not implemented by this subclass yet.");
}
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 103da146b585..d7d293fe7cb7 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -3011,15 +3011,9 @@ std::vector<ComboBoxTextItem>
BuilderBase::handleItems(xmlreader::XmlReader& rea
return aItems;
}
-void VclBuilder::handleMenu(xmlreader::XmlReader& reader, vcl::Window*
pParent, const OUString& rID,
- bool bMenuBar)
+void VclBuilder::handleMenu(xmlreader::XmlReader& reader, const OUString& rID)
{
- VclPtr<Menu> pCurrentMenu;
- if (bMenuBar)
- pCurrentMenu = VclPtr<MenuBar>::Create();
- else
- pCurrentMenu = VclPtr<PopupMenu>::Create();
-
+ VclPtr<Menu> pCurrentMenu = VclPtr<PopupMenu>::Create();
pCurrentMenu->set_id(rID);
int nLevel = 1;
@@ -3061,12 +3055,6 @@ void VclBuilder::handleMenu(xmlreader::XmlReader&
reader, vcl::Window* pParent,
}
m_aMenus.emplace_back(rID, pCurrentMenu);
-
- if (bMenuBar && pParent)
- {
- if (SystemWindow* pTopLevel = pParent->GetSystemWindow())
- pTopLevel->SetMenuBar(dynamic_cast<MenuBar*>(pCurrentMenu.get()));
- }
}
void VclBuilder::handleMenuChild(Menu *pParent, xmlreader::XmlReader &reader)
