Add missing wxABI_VERSION checks and version script entries.

Newly overridden virtual methods must be taken in wxABI_VERSION checks as
otherwise any program using the class deriving from the one containing this
method would reference the method in the vtbl of that class and so become
ABI-incompatible with the earlier shared library versions.

Also add wxABI_VERSION guard around the entire wxSimplebookXmlHandler class
added in 3.0.2.
This commit is contained in:
Vadim Zeitlin
2015-05-27 15:07:05 +02:00
parent 877b972d8f
commit 7b25b65a2f
4 changed files with 18 additions and 0 deletions

View File

@@ -34,7 +34,9 @@ public:
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
virtual wxEllipsizeMode GetEllipsizeMode() const;
#if wxABI_VERSION >= 30003
virtual bool FinishEditing();
#endif
// GTK-specific implementation
// ---------------------------

View File

@@ -316,7 +316,9 @@ public:
const wxString& text,
int argFlags = 0 ) const;
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
#if wxABI_VERSION >= 30003
virtual wxVariant DoGetAttribute( const wxString& name ) const;
#endif
virtual bool ValidateValue( wxVariant& value,
wxPGValidationInfo& validationInfo ) const;

View File

@@ -14,6 +14,8 @@
#if wxUSE_XRC && wxUSE_BOOKCTRL
#if wxABI_VERSION >= 30002
class wxSimplebook;
class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler
@@ -31,6 +33,8 @@ private:
wxDECLARE_DYNAMIC_CLASS(wxSimplebookXmlHandler);
};
#endif // wxABI_VERSION >= 30002
#endif // wxUSE_XRC && wxUSE_BOOKCTRL
#endif // _WX_XH_SIMPLEBOOK_H_

View File

@@ -21,6 +21,16 @@
# and once released its version cannot be changed.
# public symbols added in 3.0.3 (please keep in alphabetical order):
@WX_VERSION_TAG@.3 {
*wxDataViewRenderer*FinishEditing*;
*wxFloatProperty*DoGetAttribute*;
# This class was actually added in 3.0.2 but not tagged correctly in it, so
# do it here following the better late than never principle.
*wxSimplebookXmlHandler*;
};
# public symbols added in 3.0.2 (please keep in alphabetical order):
@WX_VERSION_TAG@.2 {
*wxGenericListCtrl*EndEditLabel*;