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

diff --git a/include/wx/window.h b/include/wx/window.h
index bdf6b7cab6aebb556254712ca0c9e731c8f120bf..d081cd409c55261c41a1f7dfe8642dc549d80737 100644 (file)
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -989,11 +989,6 @@ public:
     wxWindow *GetAncestorWithCustomPalette() const;
 #endif // wxUSE_PALETTE
 
     wxWindow *GetAncestorWithCustomPalette() const;
 #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
     // by the user (i.e. we don't inherit default attributes) and if we don't
     // have our own 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
     // have our own explicitly set


@@ -1006,6 +1001,11 @@ protected:
     // behaviour in the most common case
     virtual bool ShouldInheritColours() const { return false; }
 
     // behaviour in the most common case
     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
     // satisfy the constraints for the windows but don't set the window sizes
 
 #if wxUSE_CONSTRAINTS
     // satisfy the constraints for the windows but don't set the window sizes