From 8083b2c754c56532b33ebd4105e94a9f67d5ea9e Mon Sep 17 00:00:00 2001 From: Gregory Hainaut Date: Mon, 21 Sep 2015 18:40:58 +0200 Subject: [PATCH] common: init values in the constructors of SpatialArrayReserve and pxStaticText --- common/src/Utilities/VirtualMemory.cpp | 2 +- common/src/Utilities/pxStaticText.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/src/Utilities/VirtualMemory.cpp b/common/src/Utilities/VirtualMemory.cpp index 9861ccfb12..cb7c2dbe6b 100644 --- a/common/src/Utilities/VirtualMemory.cpp +++ b/common/src/Utilities/VirtualMemory.cpp @@ -342,7 +342,7 @@ void BaseVmReserveListener::OnPageFaultEvent(const PageFaultInfo& info, bool& ha // -------------------------------------------------------------------------------------- SpatialArrayReserve::SpatialArrayReserve( const wxString& name ) : - _parent( name ) + _parent( name ), m_numblocks(0) { m_prot_mode = PageAccess_ReadWrite(); } diff --git a/common/src/Utilities/pxStaticText.cpp b/common/src/Utilities/pxStaticText.cpp index 2a0eb617d4..b3faf78b12 100644 --- a/common/src/Utilities/pxStaticText.cpp +++ b/common/src/Utilities/pxStaticText.cpp @@ -23,7 +23,12 @@ pxStaticText::pxStaticText( wxWindow* parent ) : _parent( parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNO_BORDER ) { + m_align = wxALIGN_CENTRE_HORIZONTAL; + m_autowrap = true; + m_wrappedWidth = -1; m_heightInLines = 1; + + SetPaddingDefaults(); } pxStaticText::pxStaticText( wxWindow* parent, const wxString& label, wxAlignment align )