SetModified updates window title ('*' is shown if modified)

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

diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
index 026827b5f5de938376328ecdd4fc5c14b8c6aa26..4af295088df1f56775e1e7f631a0b7511a53a2a4 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -241,11 +241,10 @@ class xxxObject:
                     self.params[tag] = xxxParamBitmap(node)
                 else:                   # simple parameter
                     self.params[tag] = xxxParam(node)
                     self.params[tag] = xxxParamBitmap(node)
                 else:                   # simple parameter
                     self.params[tag] = xxxParam(node)

-            else:
-                pass
-                # Remove all other nodes
-#                element.removeChild(node)
-#                node.unlink()
+            elif node.nodeType == minidom.Node.TEXT_NODE and node.data.isspace():
+                # Remove empty text nodes
+                element.removeChild(node)
+                node.unlink()

 
         # Check that all required params are set
         for param in self.required:
 
         # Check that all required params are set
         for param in self.required:


@@ -295,6 +294,12 @@ class xxxObject:
     def panelName(self):
         if self.subclass: return self.subclass + '(' + self.className + ')'
         else: return self.className
     def panelName(self):
         if self.subclass: return self.subclass + '(' + self.className + ')'
         else: return self.className

+    # Sets name of tree object
+    def setTreeName(self, name):
+        if self.hasChild: obj = self.child
+        else: obj = self
+        obj.name = name
+        obj.element.setAttribute('name', name)

 
 ################################################################################
 
 
 ################################################################################
 


@@ -397,19 +402,21 @@ class xxxFrame(xxxContainer):
               'tooltip']
 
 class xxxTool(xxxObject):
               'tooltip']
 
 class xxxTool(xxxObject):

-    allParams = ['bitmap', 'bitmap2', 'toggle', 'tooltip', 'longhelp', 'label']
+    allParams = ['bitmap', 'bitmap2', 'radio', 'toggle', 'tooltip', 'longhelp', 'label']

     required = ['bitmap']
     required = ['bitmap']

-    paramDict = {'bitmap2': ParamBitmap, 'toggle': ParamBool}
+    paramDict = {'bitmap2': ParamBitmap, 'radio': ParamBool, 'toggle': ParamBool}

     hasStyle = False
 
 class xxxToolBar(xxxContainer):
     hasStyle = False
 
 class xxxToolBar(xxxContainer):

-    allParams = ['bitmapsize', 'margins', 'packing', 'separation',
+    allParams = ['bitmapsize', 'margins', 'packing', 'separation', 'dontattachtoframe',

                  'pos', 'size', 'style']
     hasStyle = False
     paramDict = {'bitmapsize': ParamPosSize, 'margins': ParamPosSize,
                  'packing': ParamInt, 'separation': ParamInt,
                  'pos', 'size', 'style']
     hasStyle = False
     paramDict = {'bitmapsize': ParamPosSize, 'margins': ParamPosSize,
                  'packing': ParamInt, 'separation': ParamInt,

-                 'style': ParamNonGenericStyle}
-    winStyles = ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_HORIZONTAL', 'wxTB_TEXT']
+                 'dontattachtoframe': ParamBool, 'style': ParamNonGenericStyle}
+    winStyles = ['wxTB_FLAT', 'wxTB_DOCKABLE', 'wxTB_VERTICAL', 'wxTB_HORIZONTAL',
+                 'wxTB_3DBUTTONS','wxTB_TEXT', 'wxTB_NOICONS', 'wxTB_NODIVIDER',
+                 'wxTB_NOALIGN', 'wxTB_HORZ_LAYOUT', 'wxTB_HORZ_TEXT']

 
 class xxxWizard(xxxContainer):
     allParams = ['title', 'bitmap', 'pos']
 
 class xxxWizard(xxxContainer):
     allParams = ['title', 'bitmap', 'pos']


@@ -622,6 +629,7 @@ class xxxSizer(xxxContainer):
     hasName = hasStyle = False
     paramDict = {'orient': ParamOrient}
     isSizer = True
     hasName = hasStyle = False
     paramDict = {'orient': ParamOrient}
     isSizer = True

+    itemTag = 'sizeritem'               # different for some sizers

 
 class xxxBoxSizer(xxxSizer):
     allParams = ['orient']
 
 class xxxBoxSizer(xxxSizer):
     allParams = ['orient']


@@ -643,6 +651,7 @@ class xxxGridSizer(xxxSizer):
 
 class xxxStdDialogButtonSizer(xxxSizer):
     allParams = []
 
 class xxxStdDialogButtonSizer(xxxSizer):
     allParams = []

+    itemTag = 'button'

 
 # For repeated parameters
 class xxxParamMulti:
 
 # For repeated parameters
 class xxxParamMulti:


@@ -741,6 +750,16 @@ class xxxSizerItem(xxxChildContainer):
             self.child.allParams = self.child.allParams[:]
             self.child.allParams.remove('pos')
 
             self.child.allParams = self.child.allParams[:]
             self.child.allParams.remove('pos')
 

+class xxxSizerItemButton(xxxSizerItem):
+    allParams = []
+    paramDict = {}
+    def __init__(self, parent, element):
+        xxxChildContainer.__init__(self, parent, element)
+        # Remove pos parameter - not needed for sizeritems
+        if 'pos' in self.child.allParams:
+            self.child.allParams = self.child.allParams[:]
+            self.child.allParams.remove('pos')
+

 class xxxNotebookPage(xxxChildContainer):
     allParams = ['label', 'selected']
     paramDict = {'selected': ParamBool}
 class xxxNotebookPage(xxxChildContainer):
     allParams = ['label', 'selected']
     paramDict = {'selected': ParamBool}


@@ -841,7 +860,7 @@ xxxDict = {
     'wxFlexGridSizer': xxxFlexGridSizer,
     'wxGridBagSizer': xxxGridBagSizer,
     'wxStdDialogButtonSizer': xxxStdDialogButtonSizer,
     'wxFlexGridSizer': xxxFlexGridSizer,
     'wxGridBagSizer': xxxGridBagSizer,
     'wxStdDialogButtonSizer': xxxStdDialogButtonSizer,

-    'sizeritem': xxxSizerItem,
+    'sizeritem': xxxSizerItem, 'button': xxxSizerItemButton,

     'spacer': xxxSpacer,
 
     'wxMenuBar': xxxMenuBar,
     'spacer': xxxSpacer,
 
     'wxMenuBar': xxxMenuBar,


@@ -906,7 +925,7 @@ def MakeEmptyXXX(parent, className):
     # If parent is a sizer, we should create sizeritem object, except for spacers
     if parent:
         if parent.isSizer and className != 'spacer':
     # If parent is a sizer, we should create sizeritem object, except for spacers
     if parent:
         if parent.isSizer and className != 'spacer':

-            sizerItemElem = MakeEmptyDOM('sizeritem')
+            sizerItemElem = MakeEmptyDOM(parent.itemTag)

             sizerItemElem.appendChild(elem)
             elem = sizerItemElem
         elif isinstance(parent, xxxNotebook):
             sizerItemElem.appendChild(elem)
             elem = sizerItemElem
         elif isinstance(parent, xxxNotebook):