Merge branch 'qt_fix_radiobox_layout' of https://github.com/GeoTeric/wxWidgets

Add support for grid layout for wxRadioBox under wxQt. See https://github.com/wxWidgets/wxWidgets/pull/1136
2019-01-18 01:14:33 +01:00
parent 715b25aaf3 4a18bc897d
commit c575f595f5
2 changed files with 50 additions and 26 deletions
--- a/include/wx/qt/radiobox.h
+++ b/include/wx/qt/radiobox.h
@@ -10,7 +10,7 @@

 class QGroupBox;
 class QButtonGroup;
-class QBoxLayout;
+class QGridLayout;

 class WXDLLIMPEXP_CORE wxRadioBox : public wxControl, public wxRadioBoxBase
 {
@@ -89,7 +89,7 @@ private:
    QButtonGroup *m_qtButtonGroup;

    // Autofit layout for buttons (either vert. or horiz.):
-    QBoxLayout *m_qtBoxLayout;
+    QGridLayout *m_qtGridLayout;

    wxDECLARE_DYNAMIC_CLASS(wxRadioBox);
 };