Add support for alignment flags to wxStaticText in wxQt

Ensure static text fields use the alignment specified by WX on creation.

This is the second commit doing this, the first one was reverted because
it accidentally included unrelated changes, sorry for the trouble.

See https://github.com/wxWidgets/wxWidgets/pull/1381
This commit is contained in:
Chris Lemin
2019-07-02 09:51:04 +01:00
committed by Vadim Zeitlin
parent a51af03670
commit efe9236b16

View File

@@ -55,6 +55,15 @@ 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 );
}