Fix wxGTK wxHyperlinkCtrl compilation problem with g++ 5.2
Make wxHyperlinkCtrl ctors non-inline to work around an error about incomplete wxHyperlinkCtrlColData in the inline ctor body with this compiler (but not with g++ 4.9 nor 5.3, somehow). Closes #17089.
This commit is contained in:
@@ -27,22 +27,18 @@ class WXDLLIMPEXP_ADV wxHyperlinkCtrl : public wxGenericHyperlinkCtrl
|
|||||||
{
|
{
|
||||||
typedef wxGenericHyperlinkCtrl base_type;
|
typedef wxGenericHyperlinkCtrl base_type;
|
||||||
public:
|
public:
|
||||||
// Default constructor (for two-step construction).
|
// Constructors (notice that they can't be defined inline for this class
|
||||||
wxHyperlinkCtrl() { }
|
// because of m_colData which uses incomplete wxHyperlinkCtrlColData).
|
||||||
|
wxHyperlinkCtrl();
|
||||||
// Constructor.
|
|
||||||
wxHyperlinkCtrl(wxWindow *parent,
|
wxHyperlinkCtrl(wxWindow *parent,
|
||||||
wxWindowID id,
|
wxWindowID id,
|
||||||
const wxString& label, const wxString& url,
|
const wxString& label, const wxString& url,
|
||||||
const wxPoint& pos = wxDefaultPosition,
|
const wxPoint& pos = wxDefaultPosition,
|
||||||
const wxSize& size = wxDefaultSize,
|
const wxSize& size = wxDefaultSize,
|
||||||
long style = wxHL_DEFAULT_STYLE,
|
long style = wxHL_DEFAULT_STYLE,
|
||||||
const wxString& name = wxHyperlinkCtrlNameStr)
|
const wxString& name = wxHyperlinkCtrlNameStr);
|
||||||
{
|
|
||||||
(void)Create(parent, id, label, url, pos, size, style, name);
|
|
||||||
}
|
|
||||||
|
|
||||||
~wxHyperlinkCtrl();
|
virtual ~wxHyperlinkCtrl();
|
||||||
|
|
||||||
// Creation function (for two-step construction).
|
// Creation function (for two-step construction).
|
||||||
bool Create(wxWindow *parent,
|
bool Create(wxWindow *parent,
|
||||||
|
@@ -110,6 +110,22 @@ public:
|
|||||||
// wxHyperlinkCtrl
|
// wxHyperlinkCtrl
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
wxHyperlinkCtrl::wxHyperlinkCtrl()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
wxHyperlinkCtrl::wxHyperlinkCtrl(wxWindow *parent,
|
||||||
|
wxWindowID id,
|
||||||
|
const wxString& label,
|
||||||
|
const wxString& url,
|
||||||
|
const wxPoint& pos,
|
||||||
|
const wxSize& size,
|
||||||
|
long style,
|
||||||
|
const wxString& name)
|
||||||
|
{
|
||||||
|
(void)Create(parent, id, label, url, pos, size, style, name);
|
||||||
|
}
|
||||||
|
|
||||||
wxHyperlinkCtrl::~wxHyperlinkCtrl()
|
wxHyperlinkCtrl::~wxHyperlinkCtrl()
|
||||||
{
|
{
|
||||||
#ifndef __WXGTK3__
|
#ifndef __WXGTK3__
|
||||||
|
Reference in New Issue
Block a user