apparently the check for too small rect is needed not only with wxNB_MULTILINE (see...

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

diff --git a/wxPython/demo/StyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py
index 169ddc315610e35495f3ff0645b7955c344d8ffe..e976433ec7517bfa3ca93c099269d25b10a0536b 100644 (file)
--- a/wxPython/demo/StyledTextCtrl_2.py
+++ b/wxPython/demo/StyledTextCtrl_2.py
@@ -42,9 +42,10 @@ class PythonSTC(stc.StyledTextCtrl):
 
     fold_symbols = 2
     
-    def __init__(self, parent, ID, style=0):
-        stc.StyledTextCtrl.__init__(self, parent, ID,
-                                  style = style|wx.NO_FULL_REPAINT_ON_RESIZE)
+    def __init__(self, parent, ID,
+                 pos=wx.DefaultPosition, size=wx.DefaultSize,
+                 style=0):
+        stc.StyledTextCtrl.__init__(self, parent, ID, pos, size, style)
 
         self.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)
         self.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT)
@@ -59,6 +60,7 @@ class PythonSTC(stc.StyledTextCtrl):
         self.SetViewWhiteSpace(False)
         #self.SetBufferedDraw(False)
         #self.SetViewEOL(True)
+        #self.SetEOLMode(stc.STC_EOL_CRLF)
         #self.SetUseAntiAliasing(True)
         
         self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)
@@ -166,9 +168,17 @@ class PythonSTC(stc.StyledTextCtrl):
 
         # register some images for use in the AutoComplete box.
         self.RegisterImage(1, images.getSmilesBitmap())
-        self.RegisterImage(2, images.getFile1Bitmap())
-        self.RegisterImage(3, images.getCopy2Bitmap())
-
+        self.RegisterImage(2, self._fix_image(
+            wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, (16,16))))
+        self.RegisterImage(3, self._fix_image(
+            wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, (16,16))))
+
+    def _fix_image(self, bmp):
+        img = bmp.ConvertToImage()
+        if img.HasAlpha():
+            img.ConvertAlphaToMask()
+            bmp = wx.BitmapFromImage(img)
+        return bmp
 
     def OnKeyPressed(self, event):
         if self.CallTipActive():