added a test to check how exception handling works with Win32 SEH; corrected copyright

[wxWidgets.git] / wxPython / wx / tools / XRCed / params.py

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index 49b0f8660688b2f85d64dc6ba0055d47786f08b8..64330ae9ec06351673af5d2aa6d3756e46c2c4c8 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -10,11 +10,20 @@ from globals import *
 from types import *
 from wxPython.xrc import *
 
-genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER',
-                 'wxSUNKEN_BORDER', 'wxRAISED_BORDER',
-                 'wxSTATIC_BORDER', 'wxNO_BORDER',
-                 'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS',
-                 'wxNO_FULL_REPAINT_ON_RESIZE']
+genericStyles = [
+    'wxCLIP_CHILDREN',
+    'wxSIMPLE_BORDER',
+    'wxSUNKEN_BORDER',
+    'wxDOUBLE_BORDER',
+    'wxRAISED_BORDER',
+    'wxSTATIC_BORDER',
+    'wxNO_BORDER',
+    'wxTRANSPARENT_WINDOW',
+    'wxWANTS_CHARS',
+    'wxNO_FULL_REPAINT_ON_RESIZE',
+    'wxFULL_REPAINT_ON_RESIZE',
+    'wxWS_EX_BLOCK_EVENTS',
+]
 
 buttonSize = (35,-1)    # in dialog units, transformed to pixels in panel ctor
 
@@ -852,6 +861,7 @@ paramDict = {
     'flag': ParamFlag,
     'style': ParamStyle, 'exstyle': ParamExStyle,
     'pos': ParamPosSize, 'size': ParamPosSize,
+    'cellpos': ParamPosSize, 'cellspan': ParamPosSize,
     'border': ParamUnit, 'cols': ParamInt, 'rows': ParamInt,
     'vgap': ParamUnit, 'hgap': ParamUnit,
     'checkable': ParamBool, 'checked': ParamBool, 'radio': ParamBool,