comparison widgets/WindowTypeSelector.cpp @ 997:296ccd36f626 tony-2.0-integration

Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 6645b6b8356f
children
comparison
equal deleted inserted replaced
943:788b7623bfca 997:296ccd36f626
76 layout->addWidget(m_windowShape); 76 layout->addWidget(m_windowShape);
77 layout->addWidget(m_windowCombo); 77 layout->addWidget(m_windowCombo);
78 78
79 connect(m_windowCombo, SIGNAL(currentIndexChanged(int)), 79 connect(m_windowCombo, SIGNAL(currentIndexChanged(int)),
80 this, SLOT(windowIndexChanged(int))); 80 this, SLOT(windowIndexChanged(int)));
81 windowIndexChanged(index); 81
82 m_windowType = defaultType;
83 m_windowShape->setWindowType(m_windowType);
82 } 84 }
83 85
84 WindowTypeSelector::~WindowTypeSelector() 86 WindowTypeSelector::~WindowTypeSelector()
85 { 87 {
86 delete[] m_windows; 88 delete[] m_windows;