fixed wxHyperlinkCtrl XRC handler to not crash
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -56,7 +56,7 @@ wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler()
|
|||||||
XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
|
XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
|
||||||
XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
|
XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
|
||||||
XRC_ADD_STYLE(wxHL_DEFAULT_STYLE);
|
XRC_ADD_STYLE(wxHL_DEFAULT_STYLE);
|
||||||
|
|
||||||
AddWindowStyles();
|
AddWindowStyles();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -64,12 +64,13 @@ wxObject *wxHyperlinkCtrlXmlHandler::DoCreateResource()
|
|||||||
{
|
{
|
||||||
XRC_MAKE_INSTANCE(control, wxHyperlinkCtrl)
|
XRC_MAKE_INSTANCE(control, wxHyperlinkCtrl)
|
||||||
|
|
||||||
SetupWindow(control);
|
|
||||||
control->Create(m_parentAsWindow, GetID(),
|
control->Create(m_parentAsWindow, GetID(),
|
||||||
GetParamValue(wxT("label")), GetParamValue(wxT("url")),
|
GetParamValue(wxT("label")), GetParamValue(wxT("url")),
|
||||||
GetPosition(), GetSize(),
|
GetPosition(), GetSize(),
|
||||||
GetStyle(wxT("style"), wxHL_DEFAULT_STYLE));
|
GetStyle(wxT("style"), wxHL_DEFAULT_STYLE));
|
||||||
|
|
||||||
|
SetupWindow(control);
|
||||||
|
|
||||||
return control;
|
return control;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user