X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/65fe3842bf62e64307050edb554cc0ef08d6bbae..4f2570aaf16049c11fc50d85cb15952e73bbab85:/wxPython/src/msw/wx.py

diff --git a/wxPython/src/msw/wx.py b/wxPython/src/msw/wx.py
index ffc7d1d086..59779e933e 100644
--- a/wxPython/src/msw/wx.py
+++ b/wxPython/src/msw/wx.py
@@ -173,12 +173,14 @@ wxRAISED_BORDER = wxc.wxRAISED_BORDER
 wxBORDER = wxc.wxBORDER
 wxSIMPLE_BORDER = wxc.wxSIMPLE_BORDER
 wxSTATIC_BORDER = wxc.wxSTATIC_BORDER
+wxBORDER_MASK = wxc.wxBORDER_MASK
 wxTRANSPARENT_WINDOW = wxc.wxTRANSPARENT_WINDOW
 wxNO_BORDER = wxc.wxNO_BORDER
 wxUSER_COLOURS = wxc.wxUSER_COLOURS
 wxNO_3D = wxc.wxNO_3D
 wxTAB_TRAVERSAL = wxc.wxTAB_TRAVERSAL
 wxWANTS_CHARS = wxc.wxWANTS_CHARS
+wxPOPUP_WINDOW = wxc.wxPOPUP_WINDOW
 wxHORIZONTAL = wxc.wxHORIZONTAL
 wxVERTICAL = wxc.wxVERTICAL
 wxBOTH = wxc.wxBOTH
@@ -253,6 +255,7 @@ wxTE_MULTILINE = wxc.wxTE_MULTILINE
 wxTE_AUTO_SCROLL = wxc.wxTE_AUTO_SCROLL
 wxTE_NO_VSCROLL = wxc.wxTE_NO_VSCROLL
 wxTE_AUTO_URL = wxc.wxTE_AUTO_URL
+wxTE_NOHIDESEL = wxc.wxTE_NOHIDESEL
 wxCB_SIMPLE = wxc.wxCB_SIMPLE
 wxCB_DROPDOWN = wxc.wxCB_DROPDOWN
 wxCB_SORT = wxc.wxCB_SORT
@@ -434,6 +437,7 @@ wxJOY_BUTTON3 = wxc.wxJOY_BUTTON3
 wxJOY_BUTTON4 = wxc.wxJOY_BUTTON4
 wxJOY_BUTTON_ANY = wxc.wxJOY_BUTTON_ANY
 wxWS_EX_VALIDATE_RECURSIVELY = wxc.wxWS_EX_VALIDATE_RECURSIVELY
+wxWS_EX_BLOCK_EVENTS = wxc.wxWS_EX_BLOCK_EVENTS
 wxMM_TEXT = wxc.wxMM_TEXT
 wxMM_LOMETRIC = wxc.wxMM_LOMETRIC
 wxMM_HIMETRIC = wxc.wxMM_HIMETRIC
@@ -1495,7 +1499,8 @@ def wxPyTypeCast(obj, typeStr):
     theClass = globals()[typeStr+"Ptr"]
     typeStr = __wxPyPtrTypeMap.get(typeStr, typeStr)
     if hasattr(obj, "this"):
-        if obj.__class__ is theClass:   # if already the right type then just return it
+        # if already the right type then just return it
+        if isinstance(obj, theClass) or obj.__class__ is theClass:
             return obj
         newPtr = ptrcast(obj.this, typeStr+"_p")
     else: