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

Add missing field initialization to a number of wxQt controls.

See https://github.com/wxWidgets/wxWidgets/pull/1092

src/qt/app.cpp

@@ -20,6 +20,8 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxEvtHandler);
 wxApp::wxApp()
 {
     m_qtApplication = NULL;
+    m_qtArgc = 0;
+    m_qtArgv = NULL;
 }
 
 

src/qt/checkbox.cpp

@@ -46,7 +46,8 @@ void wxQtCheckBox::clicked( bool checked )
 }
 
 
-wxCheckBox::wxCheckBox()
+wxCheckBox::wxCheckBox() :
+    m_qtCheckBox(NULL)
 {
 }
 

src/qt/choice.cpp

@@ -37,7 +37,8 @@ void wxQtChoice::activated(int WXUNUSED(index))
 }
 
 
-wxChoice::wxChoice()
+wxChoice::wxChoice() :
+    m_qtComboBox(NULL)
 {
 }
 

src/qt/combobox.cpp

@@ -112,7 +112,8 @@ bool wxComboBox::Create(wxWindow *parent, wxWindowID id,
             const wxValidator& validator,
             const wxString& name )
 {
-    return Create( parent, id, value, pos, size, choices.size(), &choices[ 0 ],
+    const wxString *pChoices = choices.size() ? &choices[ 0 ] : NULL;
+    return Create(parent, id, value, pos, size, choices.size(), pChoices,
                   style, validator, name );
 }
 

src/qt/dc.cpp

@@ -117,14 +117,50 @@ bool wxQtDCImpl::CanGetTextExtent() const
 
 void wxQtDCImpl::DoGetSize(int *width, int *height) const
 {
-    if (width)  *width  = m_qtPainter->device()->width();
+    QPaintDevice *pDevice = m_qtPainter->device();
-    if (height) *height = m_qtPainter->device()->height();
+
+    int deviceWidth;
+    int deviceHeight;
+
+    if ( pDevice )
+    {
+        deviceWidth = pDevice->width();
+        deviceHeight = pDevice->height();
+    }
+    else
+    {
+        deviceWidth = 0;
+        deviceHeight = 0;
+
+    }
+    if ( width )
+        *width = deviceWidth;
+    if ( height )
+        *height = deviceHeight;
 }
 
 void wxQtDCImpl::DoGetSizeMM(int* width, int* height) const
 {
-    if (width)  *width  = m_qtPainter->device()->widthMM();
+    QPaintDevice *pDevice = m_qtPainter->device();
-    if (height) *height = m_qtPainter->device()->heightMM();
+
+    int deviceWidthMM;
+    int deviceHeightMM;
+
+    if ( pDevice )
+    {
+        deviceWidthMM = pDevice->widthMM();
+        deviceHeightMM = pDevice->heightMM();
+    }
+    else
+    {
+        deviceWidthMM = 0;
+        deviceHeightMM = 0;
+    }
+
+    if ( width )
+        *width = deviceWidthMM;
+    if ( height )
+        *height = deviceHeightMM;
 }
 
 int wxQtDCImpl::GetDepth() const

src/qt/gauge.cpp

@@ -29,7 +29,8 @@ wxQtProgressBar::wxQtProgressBar( wxWindow *parent, wxGauge *handler )
 }
 
 
-wxGauge::wxGauge()
+wxGauge::wxGauge() :
+    m_qtProgressBar(NULL)
 {
 }
 

src/qt/listbox.cpp

@@ -45,7 +45,8 @@ void wxQtListWidget::doubleClicked( const QModelIndex &index )
 }
 
 
-wxListBox::wxListBox()
+wxListBox::wxListBox() :
+    m_qtListWidget(NULL)
 {
     Init();
 }

src/qt/listctrl.cpp

@@ -154,6 +154,7 @@ void wxListCtrl::Init()
     m_ownsImageListSmall = false;
     m_imageListState = NULL;
     m_ownsImageListState = false;
+    m_qtTreeWidget = NULL;
 }
 
 wxListCtrl::~wxListCtrl()

src/qt/notebook.cpp

@@ -50,7 +50,8 @@ void wxQtTabWidget::currentChanged(int index)
 }
 
 
-wxNotebook::wxNotebook()
+wxNotebook::wxNotebook() :
+    m_qtTabWidget(NULL)
 {
 }
 

src/qt/radiobox.cpp

@@ -56,7 +56,10 @@ void wxQtButtonGroup::buttonClicked(int index) {
 wxIMPLEMENT_DYNAMIC_CLASS(wxRadioBox, wxControl);
 
 
-wxRadioBox::wxRadioBox()
+wxRadioBox::wxRadioBox() :
+    m_qtGroupBox(NULL),
+    m_qtButtonGroup(NULL),
+    m_qtBoxLayout(NULL)
 {
 }
 

src/qt/radiobut.cpp

@@ -13,7 +13,8 @@
 
 #include <QtWidgets/QRadioButton>
 
-wxRadioButton::wxRadioButton()
+wxRadioButton::wxRadioButton() :
+    m_qtRadioButton(NULL)
 {
 }
 

src/qt/scrolbar.cpp

@@ -27,7 +27,8 @@ class wxQtScrollBar : public wxQtEventSignalHandler< QScrollBar, wxScrollBar >
 };
 
 
-wxScrollBar::wxScrollBar()
+wxScrollBar::wxScrollBar() :
+    m_qtScrollBar(NULL)
 {
 }
 

src/qt/slider.cpp

@@ -46,7 +46,8 @@ void wxQtSlider::valueChanged(int position)
 }
 
 
-wxSlider::wxSlider()
+wxSlider::wxSlider() :
+    m_qtSlider(NULL)
 {
 }
 

src/qt/spinbutt.cpp

@@ -41,7 +41,8 @@ void wxQtSpinButton::valueChanged(int value)
 }
 
 
-wxSpinButton::wxSpinButton()
+wxSpinButton::wxSpinButton() :
+    m_qtSpinBox(NULL)
 {
 }
 

src/qt/spinctrl.cpp

@@ -18,7 +18,8 @@
 #include <QtWidgets/QSpinBox>
 
 template< typename T, typename Widget >
-wxSpinCtrlQt< T, Widget >::wxSpinCtrlQt()
+wxSpinCtrlQt< T, Widget >::wxSpinCtrlQt() :
+    m_qtSpinBox(NULL)
 {
 }
 

src/qt/statbmp.cpp

@@ -21,7 +21,8 @@ public:
 };
 
 
-wxStaticBitmap::wxStaticBitmap()
+wxStaticBitmap::wxStaticBitmap() :
+    m_qtLabel(NULL)
 {
 }
 

src/qt/statbox.cpp

@@ -23,7 +23,8 @@ public:
 };
 
 
-wxStaticBox::wxStaticBox()
+wxStaticBox::wxStaticBox() :
+    m_qtGroupBox(NULL)
 {
 }
 

src/qt/statline.cpp

@@ -12,7 +12,8 @@
 
 #include <QtWidgets/QFrame>
 
-wxStaticLine::wxStaticLine()
+wxStaticLine::wxStaticLine() :
+    m_qtFrame(NULL)
 {
 }
 

src/qt/stattext.cpp

@@ -22,7 +22,8 @@ public:
 };
 
 
-wxStaticText::wxStaticText()
+wxStaticText::wxStaticText() :
+    m_qtLabel(NULL)
 {
 }
 

src/qt/statusbar.cpp

@@ -105,6 +105,7 @@ void wxStatusBar::Refresh( bool eraseBackground, const wxRect *rect )
 
 void wxStatusBar::Init()
 {
+    m_qtStatusBar = NULL;
     m_qtPanes = NULL;
 }
 

src/qt/window.cpp

@@ -1074,6 +1074,7 @@ bool wxWindowQt::QtHandlePaintEvent ( QWidget *handler, QPaintEvent *event )
                             dc.SetDeviceClippingRegion( m_updateRegion );
 
                             wxEraseEvent erase( GetId(), &dc );
+                            erase.SetEventObject(this);
                             if ( ProcessWindowEvent(erase) )
                             {
                                 // background erased, don't do it again