a couple fixes for wxpy4

Author: PythonCHB

lupa.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 """
 A small program to produce a "magnifying glass" effect over an image.
 
@@ -38,26 +37,22 @@ def OnPaint(self, evt):
         y = max(self.mpos[1] - 20, 0)
         zoomed = None
         try:
-            zoomed = self.bmp.GetSubBitmap((x-self.SampleSize/2,
-                                            y-self.SampleSize/2,
-                                            self.SampleSize,
-                                            self.SampleSize)).ConvertToImage()
+            zoomed = self.bmp.GetSubBitmap(
+                (x - self.SampleSize / 2, y - self.SampleSize / 2,
+                 self.SampleSize, self.SampleSize)).ConvertToImage()
             zoomed.Rescale(self.ZoomedSize, self.ZoomedSize)
             zoomed = zoomed.ConvertToBitmap()
         except wx._core.PyAssertionError:
             zoomed = None
 
-        offscreenBMP = wx.EmptyBitmap(*self.size)
+        offscreenBMP = wx.Bitmap(*self.size)
         self.offDC = wx.MemoryDC()
         self.offDC.SelectObject(offscreenBMP)
         self.offDC.Clear()
-        self.offDC.BeginDrawing()
         self.offDC.DrawBitmap(self.bmp, 0, 0, True)
         if zoomed is not None:
-            self.offDC.DrawBitmap(zoomed,
-                                  x - self.ZoomedSize / 2,
+            self.offDC.DrawBitmap(zoomed, x - self.ZoomedSize / 2,
                                   y - self.ZoomedSize / 2, True)
-        self.offDC.EndDrawing()
         self.dc = wx.PaintDC(self)
         self.dc.Blit(0, 0, self.size[0], self.size[1], self.offDC, 0, 0)
         evt.Skip()

lupa2.py

@@ -1,5 +1,4 @@
 #!/usr/bin/python
-
 """
 A small program to produce a "magnifying glass" effect over an image.
 
@@ -11,19 +10,20 @@
 try:
     import fixdc
 except ImportError:
-    pass # If you get an error like: DC_DrawBitmap() takes at most 4 arguments (5 given)
-         # you need the fixdc module, and don't have it
+    pass  # If you get an error like: DC_DrawBitmap() takes at most 4 arguments (5 given)
+    # you need the fixdc module, and don't have it
 import wx
 
+
 class MyCanvas(wx.Panel):
     def __init__(self, parent):
         wx.Panel.__init__(self, parent, -1)
         self.bmp = wx.Bitmap('splash.gif')
-        self.mpos = (0,0)
+        self.mpos = (0, 0)
         self.Bind(wx.EVT_PAINT, self.OnPaint)
         self.Bind(wx.EVT_MOTION, self.OnMouseMove)
         #self.SetSizeHints(*self.bmp.GetSize())
-        self.SetSizeHints( self.bmp.GetWidth(), self.bmp.GetHeight() )
+        self.SetSizeHints(self.bmp.GetWidth(), self.bmp.GetHeight())
         self.lentSize = 80
         self.Zoom = 2.
         self.usePIL = False
@@ -35,24 +35,24 @@ def OnMouseMove(self, evt):
 
     def SetMask(self, bmp):
         #size = bmp.GetSize()
-        size = ( self.bmp.GetWidth(), self.bmp.GetHeight() )
-        mask = wx.EmptyBitmap(*size)
+        size = (self.bmp.GetWidth(), self.bmp.GetHeight())
+        mask = wx.Bitmap(*size)
         mdc = wx.MemoryDC()
         mdc.SelectObject(mask)
         mdc.SetBrush(wx.BLACK_BRUSH)
-        mdc.DrawRectangle(0,0, size[0], size[1])
+        mdc.DrawRectangle(0, 0, size[0], size[1])
         mdc.SetBrush(wx.WHITE_BRUSH)
-        mdc.DrawEllipse(0,0, size[0], size[1])
+        mdc.DrawEllipse(0, 0, size[0], size[1])
         mdc.SelectObject(wx.NullBitmap)
         m = wx.Mask(mask)
         bmp.SetMask(m)
 
     def getAALoupe(self):
-        sample = self.lentSize/self.Zoom
-        x = self.mpos[0]-sample/2
-        y = self.mpos[1]-sample/2
+        sample = self.lentSize / self.Zoom
+        x = self.mpos[0] - sample / 2
+        y = self.mpos[1] - sample / 2
         from PIL import Image
-        loupe = wx.EmptyBitmap(sample, sample)
+        loupe = wx.Bitmap(sample, sample)
         mdc = wx.MemoryDC()
         mdc.SelectObject(loupe)
         mdc.Blit(0, 0, sample, sample, self.offDC, x, y)
@@ -68,10 +68,10 @@ def getAALoupe(self):
         return loupe
 
     def getLoupe(self):
-        sample = self.lentSize/self.Zoom
+        sample = self.lentSize / self.Zoom
         x = self.mpos[0] - sample / 2
         y = self.mpos[1] - sample / 2
-        loupe = wx.EmptyBitmap(self.lentSize, self.lentSize)
+        loupe = wx.Bitmap(self.lentSize, self.lentSize)
         mdc = wx.MemoryDC()
         mdc.SelectObject(loupe)
         mdc.SetUserScale(self.Zoom, self.Zoom)
@@ -83,11 +83,10 @@ def getLoupe(self):
     def OnPaint(self, evt):
         #self.size = self.bmp.GetSize()
         self.size = (self.bmp.GetWidth(), self.bmp.GetHeight())
-        offscreenBMP = wx.EmptyBitmap(*self.size)
+        offscreenBMP = wx.Bitmap(*self.size)
         self.offDC = wx.MemoryDC()
         self.offDC.SelectObject(offscreenBMP)
         self.offDC.Clear()
-        self.offDC.BeginDrawing()
         self.offDC.DrawBitmap(self.bmp, 0, 0, True)
 
         if self.usePIL:
@@ -97,13 +96,12 @@ def OnPaint(self, evt):
                 loupe = self.getLoupe()
         else:
             loupe = self.getLoupe()
-        x = self.mpos[0]-self.lentSize/2
-        y = self.mpos[1]-self.lentSize/2
+        x = self.mpos[0] - self.lentSize / 2
+        y = self.mpos[1] - self.lentSize / 2
         if self.mpos[0]>0 and self.mpos[1]>0 and \
                 self.mpos[0]<self.size[0]-1 and self.mpos[1]<self.size[1]-1:
             self.offDC.DrawBitmap(loupe, x, y, True)
 
-        self.offDC.EndDrawing()
         self.dc = wx.PaintDC(self)
         self.dc.Blit(0, 0, self.size[0], self.size[1], self.offDC, 0, 0)
         evt.Skip()
@@ -112,18 +110,19 @@ def OnPaint(self, evt):
 class Controller(wx.Panel):
     zooms = ['x2', 'x4', 'x8', 'x16']
     lents = ['80', '120', '160']
+
     def __init__(self, parent):
         self.canvas = parent.canvas
         wx.Panel.__init__(self, parent, -1)
         self.pil = wx.CheckBox(self, -1, "Use AA Resize", style=wx.ALIGN_RIGHT)
-        self.rb = wx.RadioBox(
-                self, -1, "Zoom:", wx.DefaultPosition, wx.DefaultSize,
-                self.zooms, 1, wx.RA_SPECIFY_ROWS)
-        self.loupe = wx.RadioBox(
-                self, -1, "Lent Size:", wx.DefaultPosition, wx.DefaultSize,
-                self.lents, 1, wx.RA_SPECIFY_ROWS)
+        self.rb = wx.RadioBox(self, -1, "Zoom:", wx.DefaultPosition,
+                              wx.DefaultSize, self.zooms, 1,
+                              wx.RA_SPECIFY_ROWS)
+        self.loupe = wx.RadioBox(self, -1, "Lent Size:", wx.DefaultPosition,
+                                 wx.DefaultSize, self.lents, 1,
+                                 wx.RA_SPECIFY_ROWS)
         sizer = wx.BoxSizer(wx.HORIZONTAL)
-        sizer.Add(self.pil, 0, wx.ALIGN_CENTER|wx.ALL, 5)
+        sizer.Add(self.pil, 0, wx.ALIGN_CENTER | wx.ALL, 5)
         sizer.Add((-1, -1), 1)
         sizer.Add(self.loupe, 0, wx.ALL, 5)
         sizer.Add((-1, -1), 1)
@@ -148,7 +147,7 @@ def __init__(self):
         wx.Frame.__init__(self, None, -1, "Lupa")
         self.canvas = MyCanvas(self)
         self.controller = Controller(self)
-        sizer  = wx.BoxSizer(wx.VERTICAL)
+        sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.canvas)
         sizer.Add(self.controller, 0, wx.EXPAND)
         #self.SetSizerAndFit(sizer)