Don't override methods that are in wxControlWithItems

[wxWidgets.git] / wxPython / wx / py / editwindow.py

diff --git a/wxPython/wx/py/editwindow.py b/wxPython/wx/py/editwindow.py
index cb1811f67578fa68f587b8053cc09f0deac6ebf0..90aebf59538a5ac8ef164bff8de51e37e303573f 100644 (file)
--- a/wxPython/wx/py/editwindow.py
+++ b/wxPython/wx/py/editwindow.py
@@ -19,11 +19,11 @@ from version import VERSION
 if 'wxMSW' in wx.PlatformInfo:
     FACES = { 'times'     : 'Times New Roman',
               'mono'      : 'Courier New',
 if 'wxMSW' in wx.PlatformInfo:
     FACES = { 'times'     : 'Times New Roman',
               'mono'      : 'Courier New',

-              'helv'      : 'Lucida Console',
+              'helv'      : 'Arial',

               'lucida'    : 'Lucida Console',
               'other'     : 'Comic Sans MS',
               'size'      : 10,
               'lucida'    : 'Lucida Console',
               'other'     : 'Comic Sans MS',
               'size'      : 10,

-              'lnsize'    : 9,
+              'lnsize'    : 8,

               'backcol'   : '#FFFFFF',
               'calltipbg' : '#FFFFB8',
               'calltipfg' : '#404040',
               'backcol'   : '#FFFFFF',
               'calltipbg' : '#FFFFB8',
               'calltipfg' : '#404040',


@@ -41,7 +41,19 @@ elif 'wxGTK' in wx.PlatformInfo and 'gtk2' in wx.PlatformInfo:
               'calltipfg' : '#404040',
             }
 
               'calltipfg' : '#404040',
             }
 

-else: # GTK1, OSX, etc.
+elif 'wxMac' in wx.PlatformInfo:
+    FACES = { 'times'     : 'Lucida Grande',
+              'mono'      : 'Courier New',
+              'helv'      : 'Geneva',
+              'other'     : 'new century schoolbook',
+              'size'      : 13,
+              'lnsize'    : 10,
+              'backcol'   : '#FFFFFF',
+              'calltipbg' : '#FFFFB8',
+              'calltipfg' : '#404040',
+            }
+
+else: # GTK1, etc.

     FACES = { 'times'     : 'Times',
               'mono'      : 'Courier',
               'helv'      : 'Helvetica',
     FACES = { 'times'     : 'Times',
               'mono'      : 'Courier',
               'helv'      : 'Helvetica',