summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-02 17:16:02 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-01-06 20:34:00 +0100
commit08dc46adc1aa50deb645f7548a264e084d17f5f0 (patch)
tree3a5e4a604fc4293d892c1fdca1e9306b8ab179af /vcl/source
parentbd14c414082236c4be8fef8eb488afbd3dd481c6 (diff)
remove support for deprecated GtkAlignment
Change-Id: I29e21e9e4d9b80b8c8e331ed9cce76b2e7fe0f68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108689 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/window/builder.cxx2
-rw-r--r--vcl/source/window/layout.cxx52
2 files changed, 0 insertions, 54 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 7834d9f9deed..7456e4bbfece 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1857,8 +1857,6 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
m_pParserState->m_aExpanderWidgets.push_back(pExpander);
xWindow = pExpander;
}
- else if (name == "GtkAlignment")
- xWindow = VclPtr<VclAlignment>::Create(pParent);
else if (name == "GtkButton" || (!m_bLegacy && name == "GtkToggleButton"))
{
VclPtr<Button> xButton;
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 1c503194b5ae..499ea856799d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1534,58 +1534,6 @@ void VclFrame::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
rJsonWriter.put("type", "frame");
}
-Size VclAlignment::calculateRequisition() const
-{
- Size aRet(m_nLeftPadding + m_nRightPadding,
- m_nTopPadding + m_nBottomPadding);
-
- const vcl::Window *pChild = get_child();
- if (pChild && pChild->IsVisible())
- {
- Size aChildSize = getLayoutRequisition(*pChild);
- aRet.AdjustWidth(aChildSize.Width() );
- aRet.AdjustHeight(aChildSize.Height() );
- }
-
- return aRet;
-}
-
-void VclAlignment::setAllocation(const Size &rAllocation)
-{
- vcl::Window *pChild = get_child();
- if (!pChild || !pChild->IsVisible())
- return;
-
- Point aChildPos(m_nLeftPadding, m_nTopPadding);
-
- Size aAllocation;
- aAllocation.setWidth( rAllocation.Width() - (m_nLeftPadding + m_nRightPadding) );
- aAllocation.setHeight( rAllocation.Height() - (m_nTopPadding + m_nBottomPadding) );
-
- setLayoutAllocation(*pChild, aChildPos, aAllocation);
-}
-
-bool VclAlignment::set_property(const OString &rKey, const OUString &rValue)
-{
- if (rKey == "bottom-padding")
- m_nBottomPadding = rValue.toInt32();
- else if (rKey == "left-padding")
- m_nLeftPadding = rValue.toInt32();
- else if (rKey == "right-padding")
- m_nRightPadding = rValue.toInt32();
- else if (rKey == "top-padding")
- m_nTopPadding = rValue.toInt32();
- else
- return VclBin::set_property(rKey, rValue);
- return true;
-}
-
-void VclAlignment::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter)
-{
- VclContainer::DumpAsPropertyTree(rJsonWriter);
- rJsonWriter.put("type", "alignment");
-}
-
class DisclosureButton final : public CheckBox
{
virtual void ImplDrawCheckBoxState(vcl::RenderContext& rRenderContext) override