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
This commit is contained in:
Robin Dunn
2007-03-27 01:49:46 +00:00
parent fd4081aa33
commit cbfc9df676
131 changed files with 12811 additions and 4397 deletions

View File

@@ -91,11 +91,11 @@ class SimpleView(wx.Panel):
#----------------------------------------------------------------------
def runTest(frame, nb, log):
if wx.Platform == "__WXMAC__":
from Main import MessagePanel
win = MessagePanel(nb, 'This demo currently fails on the Mac. The problem is being looked into...',
'Sorry', wx.ICON_WARNING)
return win
## if wx.Platform == "__WXMAC__":
## from Main import MessagePanel
## win = MessagePanel(nb, 'This demo currently fails on the Mac. The problem is being looked into...',
## 'Sorry', wx.ICON_WARNING)
## return win
if 1:
win = gizmos.DynamicSashWindow(nb, -1, style = wx.CLIP_CHILDREN