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:
@@ -34,7 +34,9 @@ public:
|
|||||||
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
|
virtual void EnableEllipsize(wxEllipsizeMode mode = wxELLIPSIZE_MIDDLE);
|
||||||
virtual wxEllipsizeMode GetEllipsizeMode() const;
|
virtual wxEllipsizeMode GetEllipsizeMode() const;
|
||||||
|
|
||||||
|
#if wxABI_VERSION >= 30003
|
||||||
virtual bool FinishEditing();
|
virtual bool FinishEditing();
|
||||||
|
#endif
|
||||||
|
|
||||||
// GTK-specific implementation
|
// GTK-specific implementation
|
||||||
// ---------------------------
|
// ---------------------------
|
||||||
|
@@ -316,7 +316,9 @@ public:
|
|||||||
const wxString& text,
|
const wxString& text,
|
||||||
int argFlags = 0 ) const;
|
int argFlags = 0 ) const;
|
||||||
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
virtual bool DoSetAttribute( const wxString& name, wxVariant& value );
|
||||||
|
#if wxABI_VERSION >= 30003
|
||||||
virtual wxVariant DoGetAttribute( const wxString& name ) const;
|
virtual wxVariant DoGetAttribute( const wxString& name ) const;
|
||||||
|
#endif
|
||||||
virtual bool ValidateValue( wxVariant& value,
|
virtual bool ValidateValue( wxVariant& value,
|
||||||
wxPGValidationInfo& validationInfo ) const;
|
wxPGValidationInfo& validationInfo ) const;
|
||||||
|
|
||||||
|
@@ -14,6 +14,8 @@
|
|||||||
|
|
||||||
#if wxUSE_XRC && wxUSE_BOOKCTRL
|
#if wxUSE_XRC && wxUSE_BOOKCTRL
|
||||||
|
|
||||||
|
#if wxABI_VERSION >= 30002
|
||||||
|
|
||||||
class wxSimplebook;
|
class wxSimplebook;
|
||||||
|
|
||||||
class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler
|
class WXDLLIMPEXP_XRC wxSimplebookXmlHandler : public wxXmlResourceHandler
|
||||||
@@ -31,6 +33,8 @@ private:
|
|||||||
wxDECLARE_DYNAMIC_CLASS(wxSimplebookXmlHandler);
|
wxDECLARE_DYNAMIC_CLASS(wxSimplebookXmlHandler);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#endif // wxABI_VERSION >= 30002
|
||||||
|
|
||||||
#endif // wxUSE_XRC && wxUSE_BOOKCTRL
|
#endif // wxUSE_XRC && wxUSE_BOOKCTRL
|
||||||
|
|
||||||
#endif // _WX_XH_SIMPLEBOOK_H_
|
#endif // _WX_XH_SIMPLEBOOK_H_
|
||||||
|
@@ -21,6 +21,16 @@
|
|||||||
# and once released its version cannot be changed.
|
# 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):
|
# public symbols added in 3.0.2 (please keep in alphabetical order):
|
||||||
@WX_VERSION_TAG@.2 {
|
@WX_VERSION_TAG@.2 {
|
||||||
*wxGenericListCtrl*EndEditLabel*;
|
*wxGenericListCtrl*EndEditLabel*;
|
||||||
|
Reference in New Issue
Block a user