From a51af03670f4525f8bbefca7968e4f9d4e02d31b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 3 Jul 2019 23:47:09 +0200 Subject: [PATCH] Revert "Add support for alignment flags to wxStaticText in wxQt" This reverts commit 0f49825d64d722c92be06cd825fa04d1fe3b5cca because it accidentally included unrelated changes. It will be re-committed again soon. See https://github.com/wxWidgets/wxWidgets/pull/1381 --- src/expat | 2 +- src/qt/stattext.cpp | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/expat b/src/expat index ff2299e5f0..b99766ce61 160000 --- a/src/expat +++ b/src/expat @@ -1 +1 @@ -Subproject commit ff2299e5f093beb3d218cf095078869b59aeb98d +Subproject commit b99766ce61f2cefa0ada22204765c1bf08802216 diff --git a/src/qt/stattext.cpp b/src/qt/stattext.cpp index f6d2bcde63..2eb50b5f18 100644 --- a/src/qt/stattext.cpp +++ b/src/qt/stattext.cpp @@ -55,15 +55,6 @@ bool wxStaticText::Create(wxWindow *parent, m_qtLabel->setBuddy( m_qtLabel ); m_qtLabel->setTextInteractionFlags( Qt::NoTextInteraction ); - // Translate the WX horizontal alignment flags to Qt alignment flags - // (notice that wxALIGN_LEFT is default and has the value of 0). - if ( style & wxALIGN_CENTER_HORIZONTAL ) - m_qtLabel->setAlignment(Qt::AlignHCenter); - else if ((style & wxALIGN_MASK) == wxALIGN_RIGHT) - m_qtLabel->setAlignment(Qt::AlignRight); - else - m_qtLabel->setAlignment(Qt::AlignLeft); - return QtCreateControl( parent, id, pos, size, style, wxDefaultValidator, name ); }