allow border flags

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/lib/statbmp.py b/wxPython/wx/lib/statbmp.py
index fa2db42356c89927cac926996749a3674de0c19b..54dd9cc6963036c1053f13bd51cc488daa266254 100644 (file)
--- a/wxPython/wx/lib/statbmp.py
+++ b/wxPython/wx/lib/statbmp.py
@@ -21,7 +21,9 @@ class GenStaticBitmap(wx.PyControl):
                  pos = wx.DefaultPosition, size = wx.DefaultSize,
                  style = 0,
                  name = "genstatbmp"):
                  pos = wx.DefaultPosition, size = wx.DefaultSize,
                  style = 0,
                  name = "genstatbmp"):

-        wx.PyControl.__init__(self, parent, ID, pos, size, style|wx.NO_BORDER,
+        if not style & wx.BORDER_MASK:
+            style = style | wx.BORDER_NONE
+        wx.PyControl.__init__(self, parent, ID, pos, size, style,

                              wx.DefaultValidator, name)
         self._bitmap = bitmap
         self.InheritAttributes()
                              wx.DefaultValidator, name)
         self._bitmap = bitmap
         self.InheritAttributes()