Make InheritAttributes and ShouldInheritColours public so they can be
called from derived Python classes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26839 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -989,11 +989,6 @@ public:
|
|||||||
wxWindow *GetAncestorWithCustomPalette() const;
|
wxWindow *GetAncestorWithCustomPalette() const;
|
||||||
#endif // wxUSE_PALETTE
|
#endif // wxUSE_PALETTE
|
||||||
|
|
||||||
protected:
|
|
||||||
// event handling specific to wxWindow
|
|
||||||
virtual bool TryValidator(wxEvent& event);
|
|
||||||
virtual bool TryParent(wxEvent& event);
|
|
||||||
|
|
||||||
// inherit the parents visual attributes if they had been explicitly set
|
// inherit the parents visual attributes if they had been explicitly set
|
||||||
// by the user (i.e. we don't inherit default attributes) and if we don't
|
// by the user (i.e. we don't inherit default attributes) and if we don't
|
||||||
// have our own explicitly set
|
// have our own explicitly set
|
||||||
@@ -1006,6 +1001,11 @@ protected:
|
|||||||
// behaviour in the most common case
|
// behaviour in the most common case
|
||||||
virtual bool ShouldInheritColours() const { return false; }
|
virtual bool ShouldInheritColours() const { return false; }
|
||||||
|
|
||||||
|
protected:
|
||||||
|
// event handling specific to wxWindow
|
||||||
|
virtual bool TryValidator(wxEvent& event);
|
||||||
|
virtual bool TryParent(wxEvent& event);
|
||||||
|
|
||||||
|
|
||||||
#if wxUSE_CONSTRAINTS
|
#if wxUSE_CONSTRAINTS
|
||||||
// satisfy the constraints for the windows but don't set the window sizes
|
// satisfy the constraints for the windows but don't set the window sizes
|
||||||
|
Reference in New Issue
Block a user