diff --git a/include/wx/dc.h b/include/wx/dc.h index 302838ae24..f731326456 100644 --- a/include/wx/dc.h +++ b/include/wx/dc.h @@ -418,6 +418,11 @@ public: void SetClippingRegion(const wxRegion& region) { DoSetClippingRegionAsRegion(region); } +#if wxABI_VERSION >= 20811 + void SetDeviceClippingRegion(const wxRegion& region) + { DoSetClippingRegionAsRegion(region); } +#endif + virtual void DestroyClippingRegion() { ResetClipping(); } void GetClippingBox(wxCoord *x, wxCoord *y, wxCoord *w, wxCoord *h) const diff --git a/include/wx/event.h b/include/wx/event.h index 48f0a0b81c..e9ee49a8db 100644 --- a/include/wx/event.h +++ b/include/wx/event.h @@ -1442,6 +1442,9 @@ public: void SetShow(bool show) { m_show = show; } bool GetShow() const { return m_show; } +#if wxABI_VERSION >= 20811 + bool IsShown() const { return GetShow(); } +#endif virtual wxEvent *Clone() const { return new wxShowEvent(*this); } @@ -1468,7 +1471,9 @@ public: // return true if the frame was iconized, false if restored bool Iconized() const { return m_iconized; } - +#if wxABI_VERSION >= 20811 + bool IsIconized() const { return Iconized(); } +#endif virtual wxEvent *Clone() const { return new wxIconizeEvent(*this); } protected: diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h index 4d33a5cb8d..863cd26190 100644 --- a/include/wx/xml/xml.h +++ b/include/wx/xml/xml.h @@ -159,6 +159,26 @@ public: void SetProperties(wxXmlProperty *prop) { m_properties = prop; } virtual void AddProperty(wxXmlProperty *prop); +#if wxABI_VERSION >= 20811 + wxString GetAttribute(const wxString& attrName, + const wxString& defaultVal) const + { + return GetPropVal(attrName, defaultVal); + } + bool GetAttribute(const wxString& attrName, wxString *value) const + { + return GetPropVal(attrName, value); + } + void AddAttribute(const wxString& attrName, const wxString& value) + { + AddProperty(attrName, value); + } + wxXmlProperty* GetAttributes() const + { + return GetProperties(); + } +#endif // wx >= 2.8.11 + private: wxXmlNodeType m_type; wxString m_name; diff --git a/version-script.in b/version-script.in index 2ae36cf235..1f97fee8af 100644 --- a/version-script.in +++ b/version-script.in @@ -23,6 +23,14 @@ # released with the generic branch version due to the final wildcard below, # and once released its version cannot be changed. +# public symbols added in 2.8.10 (please keep in alphabetical order): +@WX_VERSION_TAG@.11 { + *wxDC*SetDeviceClippingRegion*; + *wxShowEvent*IsShown*; + *wxIconizeEvent*IsIconized*; + *wxXmlNode*Attribute*; +}; + # public symbols added in 2.8.10 (please keep in alphabetical order): @WX_VERSION_TAG@.10 { *wxAboutDialog*GetCopyrightToDisplay*;