X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f780e48af479e7bf9a07eaaa1ab6b41f1ffb17b..2eeaec1909452c66566cd99b35bad8abae9ed54f:/wxPython/samples/ide/activegrid/tool/PHPEditor.py diff --git a/wxPython/samples/ide/activegrid/tool/PHPEditor.py b/wxPython/samples/ide/activegrid/tool/PHPEditor.py index bf16594d3f..bd8fa06029 100644 --- a/wxPython/samples/ide/activegrid/tool/PHPEditor.py +++ b/wxPython/samples/ide/activegrid/tool/PHPEditor.py @@ -151,9 +151,9 @@ class PHPService(CodeEditor.CodeService): class PHPCtrl(CodeEditor.CodeCtrl): - def __init__(self, parent, ID = -1, style = wx.NO_FULL_REPAINT_ON_RESIZE): - CodeEditor.CodeCtrl.__init__(self, parent, ID, style) - self.SetLexer(wx.stc.STC_LEX_HTML) + def __init__(self, parent, id=-1, style=wx.NO_FULL_REPAINT_ON_RESIZE): + CodeEditor.CodeCtrl.__init__(self, parent, id, style) + self.SetLexer(wx.stc.STC_LEX_PHP) self.SetStyleBits(7) self.SetKeyWords(4, string.join(PHPKEYWORDS)) self.SetProperty("fold.html", "1") @@ -269,7 +269,6 @@ PHPKEYWORDS = [ # Icon Bitmaps - generated by encode_bitmaps.py #---------------------------------------------------------------------------- from wx import ImageFromStream, BitmapFromImage -from wx import EmptyIcon import cStringIO @@ -292,6 +291,4 @@ def getPHPImage(): return ImageFromStream(stream) def getPHPIcon(): - icon = EmptyIcon() - icon.CopyFromBitmap(getPHPBitmap()) - return icon + return wx.IconFromBitmap(getPHPBitmap())