Merge branch 'clang-link-error-and-semicolon-warnings' of https://github.com/MaartenBent/wxWidgets
Fix clang warnings about extra semicolons and a link error. See https://github.com/wxWidgets/wxWidgets/pull/1434
This commit is contained in:
@@ -210,7 +210,7 @@ private:
|
||||
};
|
||||
|
||||
// A plain method functor for the untyped legacy event types:
|
||||
class WXDLLIMPEXP_BASE wxObjectEventFunctor : public wxEventFunctor
|
||||
class wxObjectEventFunctor : public wxEventFunctor
|
||||
{
|
||||
public:
|
||||
wxObjectEventFunctor(wxObjectEventFunction method, wxEvtHandler *handler)
|
||||
|
@@ -326,7 +326,7 @@ public:
|
||||
// If 'id' refers to invalid property, then we will return dummy
|
||||
// attributes (i.e. root property's attributes, which contents should
|
||||
// should always be empty and of no consequence).
|
||||
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes());
|
||||
wxPG_PROP_ARG_CALL_PROLOG_RETVAL(m_pState->DoGetRoot()->GetAttributes())
|
||||
return p->GetAttributes();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user