Automatically disable wxDialupManager for wxMac and wxCocoa,

[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 caee545fca41e5bf51d9c12674b5fee73b7e72fa..ef153502b41bfec39fa75780d7070da9626282af 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -416,10 +416,10 @@ class ParamEncoding(ParamText):
 class ContentDialog(wxDialog):
     def __init__(self, parent, value):
         # Load from resource
 class ContentDialog(wxDialog):
     def __init__(self, parent, value):
         # Load from resource

-       pre = wxPreDialog()
+        pre = wxPreDialog()

         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
         self.this = pre.this
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
         self.this = pre.this

-       self._setOORInfo(self)
+        self._setOORInfo(self)

         self.list = XRCCTRL(self, 'LIST')
         # Set list items
         for v in value:
         self.list = XRCCTRL(self, 'LIST')
         # Set list items
         for v in value:


@@ -466,10 +466,10 @@ class ContentDialog(wxDialog):
 
 class ContentCheckListDialog(wxDialog):
     def __init__(self, parent, value):
 
 class ContentCheckListDialog(wxDialog):
     def __init__(self, parent, value):

-       pre = wxPreDialog()
+        pre = wxPreDialog()

         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
         self.this = pre.this
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
         self.this = pre.this

-       self._setOORInfo(self)
+        self._setOORInfo(self)

         self.list = XRCCTRL(self, 'CHECK_LIST')
         # Set list items
         i = 0
         self.list = XRCCTRL(self, 'CHECK_LIST')
         # Set list items
         i = 0


@@ -598,10 +598,10 @@ class ParamContentCheckList(ParamContent):
 
 class IntListDialog(wxDialog):
     def __init__(self, parent, value):
 
 class IntListDialog(wxDialog):
     def __init__(self, parent, value):

-       pre = wxPreDialog()
+        pre = wxPreDialog()

         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
         self.this = pre.this
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
         self.this = pre.this

-       self._setOORInfo(self)
+        self._setOORInfo(self)

         self.list = XRCCTRL(self, 'LIST')
         # Set list items
         value.sort()
         self.list = XRCCTRL(self, 'LIST')
         # Set list items
         value.sort()


@@ -774,10 +774,10 @@ class ParamFile(PPanel):
 
 class ParamBitmap(PPanel):
     def __init__(self, parent, name):
 
 class ParamBitmap(PPanel):
     def __init__(self, parent, name):

-       pre = wxPrePanel()
+        pre = wxPrePanel()

         g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
         self.this = pre.this
         g.frame.res.LoadOnPanel(pre, parent, 'PANEL_BITMAP')
         self.this = pre.this

-       self._setOORInfo(self)
+        self._setOORInfo(self)

         self.SetBackgroundColour(parent.GetBackgroundColour())
         self.SetForegroundColour(parent.GetForegroundColour())
         self.modified = self.freeze = False
         self.SetBackgroundColour(parent.GetBackgroundColour())
         self.SetForegroundColour(parent.GetForegroundColour())
         self.modified = self.freeze = False


@@ -861,6 +861,7 @@ paramDict = {
     'flag': ParamFlag,
     'style': ParamStyle, 'exstyle': ParamExStyle,
     'pos': ParamPosSize, 'size': ParamPosSize,
     '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,
     'border': ParamUnit, 'cols': ParamInt, 'rows': ParamInt,
     'vgap': ParamUnit, 'hgap': ParamUnit,
     'checkable': ParamBool, 'checked': ParamBool, 'radio': ParamBool,