fixed wxHyperlinkCtrl XRC handler to not crash

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53270 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/xrc/xh_hyperlink.cpp b/src/xrc/xh_hyperlink.cpp
index 7d0f0d5c98440421fd9089ff55547c0cd9189b68..d471b1aa5ce15d736f6061d367b5738e1c329d53 100644 (file)
--- a/src/xrc/xh_hyperlink.cpp
+++ b/src/xrc/xh_hyperlink.cpp
@@ -56,7 +56,7 @@ wxHyperlinkCtrlXmlHandler::wxHyperlinkCtrlXmlHandler()
     XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
     XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
     XRC_ADD_STYLE(wxHL_DEFAULT_STYLE);
     XRC_ADD_STYLE(wxHL_ALIGN_RIGHT);
     XRC_ADD_STYLE(wxHL_ALIGN_CENTRE);
     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(),
         GetParamValue(wxT("label")), GetParamValue(wxT("url")),
         GetPosition(), GetSize(),
         GetStyle(wxT("style"), wxHL_DEFAULT_STYLE));
 
     control->Create(m_parentAsWindow, GetID(),
         GetParamValue(wxT("label")), GetParamValue(wxT("url")),
         GetPosition(), GetSize(),
         GetStyle(wxT("style"), wxHL_DEFAULT_STYLE));
 

+    SetupWindow(control);
+

     return control;
 }
 
     return control;
 }