Be more paranoid about parent window possibly being NULL (partly fixes #11195).
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@61904 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -63,8 +63,11 @@ bool wxSpinButton::Create(
|
|||||||
m_windowId = NewControlId();
|
m_windowId = NewControlId();
|
||||||
else
|
else
|
||||||
m_windowId = vId;
|
m_windowId = vId;
|
||||||
|
if (pParent)
|
||||||
|
{
|
||||||
m_backgroundColour = pParent->GetBackgroundColour();
|
m_backgroundColour = pParent->GetBackgroundColour();
|
||||||
m_foregroundColour = pParent->GetForegroundColour();
|
m_foregroundColour = pParent->GetForegroundColour();
|
||||||
|
}
|
||||||
SetName(rsName);
|
SetName(rsName);
|
||||||
SetParent(pParent);
|
SetParent(pParent);
|
||||||
m_windowStyle = lStyle;
|
m_windowStyle = lStyle;
|
||||||
|
@@ -126,8 +126,11 @@ bool wxSpinCtrl::Create( wxWindow* pParent,
|
|||||||
m_windowId = NewControlId();
|
m_windowId = NewControlId();
|
||||||
else
|
else
|
||||||
m_windowId = vId;
|
m_windowId = vId;
|
||||||
|
if (pParent)
|
||||||
|
{
|
||||||
m_backgroundColour = pParent->GetBackgroundColour();
|
m_backgroundColour = pParent->GetBackgroundColour();
|
||||||
m_foregroundColour = pParent->GetForegroundColour();
|
m_foregroundColour = pParent->GetForegroundColour();
|
||||||
|
}
|
||||||
SetName(rsName);
|
SetName(rsName);
|
||||||
SetParent(pParent);
|
SetParent(pParent);
|
||||||
m_windowStyle = lStyle;
|
m_windowStyle = lStyle;
|
||||||
|
Reference in New Issue
Block a user