diff --git a/IPython/frontend/wx/console_widget.py b/IPython/frontend/wx/console_widget.py index 7be4d9a..6e1e1ee 100644 --- a/IPython/frontend/wx/console_widget.py +++ b/IPython/frontend/wx/console_widget.py @@ -48,10 +48,6 @@ if sys.platform == 'darwin': _DEFAULT_STYLE = { #background definition - 'stdout' : 'fore:#0000FF', - 'stderr' : 'fore:#007f00', - 'trace' : 'fore:#FF0000', - 'default' : 'size:%d' % _DEFAULT_SIZE, 'bracegood' : 'fore:#00AA00,back:#000000,bold', 'bracebad' : 'fore:#FF0000,back:#000000,bold', @@ -267,20 +263,20 @@ class ConsoleWidget(editwindow.EditWindow): def configure_scintilla(self): p = self.style - + #First we define the special background colors - if '_COMPLETE_BUFFER_BG' in p: - _COMPLETE_BUFFER_BG = p['_COMPLETE_BUFFER_BG'] + if 'trace' in p: + _COMPLETE_BUFFER_BG = p['trace'] else: _COMPLETE_BUFFER_BG = '#FAFAF1' # Nice green - if '_INPUT_BUFFER_BG' in p: - _INPUT_BUFFER_BG = p['_INPUT_BUFFER_BG'] + if 'stdout' in p: + _INPUT_BUFFER_BG = p['stdout'] else: _INPUT_BUFFER_BG = '#FDFFD3' # Nice yellow - if '_ERROR_BG' in p: - _ERROR_BG = p['_ERROR_BG'] + if 'stderr' in p: + _ERROR_BG = p['stderr'] else: _ERROR_BG = '#FFF1F1' # Nice red diff --git a/IPython/frontend/wx/ipythonx.py b/IPython/frontend/wx/ipythonx.py index 4b31e5d..36f2d80 100644 --- a/IPython/frontend/wx/ipythonx.py +++ b/IPython/frontend/wx/ipythonx.py @@ -143,16 +143,12 @@ Simple graphical frontend to IPython, using WxWidgets.""" '\x01\x1b[0;31m\x02Out[\x01\x1b[1;31m\x02$number\x01\x1b[0;31m\x02]: \x01\x1b[0m\x02', #we define the background of old inputs - '_COMPLETE_BUFFER_BG' : '#000000', # RRGGBB: Black + 'trace' : '#000000', # RRGGBB: Black #we define the background of current input - '_INPUT_BUFFER_BG' : '#444444', # RRGGBB: Light black + 'stdout' : '#444444', # RRGGBB: Light black #we define the background when an error is reported - '_ERROR_BG' : '#800000', # RRGGBB: Light Red + 'stderr' : '#800000', # RRGGBB: Light Red - #'stdout' : '',#fore:#0000FF', - #'stderr' : '',#fore:#007f00', - #'trace' : '',#fore:#FF0000', - #'bracegood' : 'fore:#0000FF,back:#0000FF,bold', #'bracebad' : 'fore:#FF0000,back:#0000FF,bold', 'default' : "fore:%s,bold" % ("#EEEEEE"),