GetBestFittingSize --> GetEffectiveMinSize

[wxWidgets.git] / wxPython / demo / Main.py

diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index c0a19c56b03df6dbc6bd64c58d34d2632e4a312f..12eb24ad90b31d71cf1176bdd9028c22688c6f9f 100644 (file)
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -60,12 +60,15 @@ _treeList = [
         'BitmapFromBuffer',
         'RawBitmapAccess',
         'DragScroller',
-##        'AlphaDrawing',
         'DelayedResult',
         'ExpandoTextCtrl',
         'ButtonPanel',
         'FlatNotebook',
         'CustomTreeCtrl',
+        'AboutBox',
+        'AnimateCtrl',
+        'AlphaDrawing',
+        'GraphicsContext',
         ]),
 
     # managed windows == things with a (optional) caption you can close
@@ -80,6 +83,7 @@ _treeList = [
 
     # the common dialogs
     ('Common Dialogs', [
+        'AboutBox',
         'ColourDialog',
         'DirDialog',
         'FileDialog',
@@ -183,7 +187,6 @@ _treeList = [
         'FloatBar',  
         'FloatCanvas',
         'FoldPanelBar',
-        'GIFAnimationCtrl',
         'HtmlWindow',
         'HyperLinkCtrl',
         'IntCtrl',
@@ -243,12 +246,12 @@ _treeList = [
 
     # Images
     ('Using Images', [
-##        'AlphaDrawing',
+        'AlphaDrawing',
+        'AnimationCtrl',
         'ArtProvider',
         'BitmapFromBuffer',
         'Cursor',
         'DragImage',
-        'GIFAnimationCtrl',
         'Image',
         'ImageAlpha',
         'ImageFromStream',
@@ -259,13 +262,14 @@ _treeList = [
 
     # Other stuff
     ('Miscellaneous', [
-##        'AlphaDrawing',
+        'AlphaDrawing',
         'ColourDB',
         ##'DialogUnits',   # needs more explanations
         'DragScroller',
         'DrawXXXList',
         'FileHistory',
         'FontEnumerator',
+        'GraphicsContext',
         'GLCanvas',
         'Joystick',
         'MimeTypesManager',
@@ -487,6 +491,11 @@ try:
             if wx.Platform == '__WXMSW__':
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
                                   'fore:#000000,back:#FFFFFF,face:Courier New,size:9')
+            elif wx.Platform == '__WXMAC__':
+                # TODO: if this looks fine on Linux too, remove the Mac-specific case 
+                # and use this whenever OS != MSW.
+                self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
+                                  'fore:#000000,back:#FFFFFF,face:Courier')
             else:
                 self.StyleSetSpec(stc.STC_STYLE_DEFAULT, 
                                   'fore:#000000,back:#FFFFFF,face:Courier,size:9')