Wrong class used in _setCallbackInfo

[wxWidgets.git] / 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 bf16594d3f76c0fcd7aeb43067ead960513fb262..fba7b6c02938944c31ce23b9e22c04e9c9ed7e93 100644 (file)
--- a/wxPython/samples/ide/activegrid/tool/PHPEditor.py
+++ b/wxPython/samples/ide/activegrid/tool/PHPEditor.py
@@ -153,7 +153,7 @@ class PHPCtrl(CodeEditor.CodeCtrl):
 
     def __init__(self, parent, ID = -1, style = wx.NO_FULL_REPAINT_ON_RESIZE):
         CodeEditor.CodeCtrl.__init__(self, parent, ID, style)
 
     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)
+        self.SetLexer(wx.stc.STC_LEX_PHP)

         self.SetStyleBits(7)
         self.SetKeyWords(4, string.join(PHPKEYWORDS))
         self.SetProperty("fold.html", "1")
         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
 # Icon Bitmaps - generated by encode_bitmaps.py
 #----------------------------------------------------------------------------
 from wx import ImageFromStream, BitmapFromImage

-from wx import EmptyIcon

 import cStringIO
 
 
 import cStringIO
 
 


@@ -292,6 +291,4 @@ def getPHPImage():
     return ImageFromStream(stream)
 
 def getPHPIcon():
     return ImageFromStream(stream)
 
 def getPHPIcon():

-    icon = EmptyIcon()
-    icon.CopyFromBitmap(getPHPBitmap())
-    return icon
+    return wx.IconFromBitmap(getPHPBitmap())