Merge recent changes from 2.8 branch.

Make updates for recent changes on CVS HEAD.
Remove or workaround deprecated items.
Fix compile errors.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45088 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/wx/lib/buttons.py

@@ -589,6 +589,8 @@ class ThemedGenButton(GenButton):
             state = 0
         else:
             state = wx.CONTROL_PRESSED
+        if not self.IsEnabled():
+            state = wx.CONTROL_DISABLED
         wx.RendererNative.Get().DrawPushButton(self, dc, rect, state)
  
 class ThemedGenBitmapButton(ThemedGenButton, GenBitmapButton):