(blind) GTK1 compilation fix

[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 535c6e239503aa659183c37022f179c2375d6713..1fb1c81ebee34e696640277e1fa8f429658a8cec 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -49,9 +49,9 @@ class xxxParam(xxxNode):
         def value(self):
             return self.textNode.data.encode(g.currentEncoding)
         def update(self, value):
         def value(self):
             return self.textNode.data.encode(g.currentEncoding)
         def update(self, value):

-           try: # handle exception if encoding is wrong
+            try: # handle exception if encoding is wrong

                 self.textNode.data = unicode(value, g.currentEncoding)
                 self.textNode.data = unicode(value, g.currentEncoding)

-           except UnicodeDecodeError:
+            except UnicodeDecodeError:

                 wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
 
 # Integer parameter
                 wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")
 
 # Integer parameter


@@ -238,9 +238,11 @@ class xxxObject:
                 else:                   # simple parameter
                     self.params[tag] = xxxParam(node)
             else:
                 else:                   # simple parameter
                     self.params[tag] = xxxParam(node)
             else:

+                pass

                 # Remove all other nodes
                 # Remove all other nodes

-                element.removeChild(node)
-                node.unlink()
+#                element.removeChild(node)
+#                node.unlink()
+

         # Check that all required params are set
         for param in self.required:
             if not self.params.has_key(param):
         # Check that all required params are set
         for param in self.required:
             if not self.params.has_key(param):


@@ -416,8 +418,7 @@ class xxxBitmap(xxxObject):
 
 # Just like bitmap
 class xxxIcon(xxxObject):
 
 # Just like bitmap
 class xxxIcon(xxxObject):

-    allParams = ['icon']
-    required = ['icon']
+    allParams = []

 
 ################################################################################
 # Controls
 
 ################################################################################
 # Controls


@@ -501,8 +502,8 @@ class xxxSplitterWindow(xxxContainer):
     allParams = ['orientation', 'sashpos', 'minsize', 'pos', 'size', 'style']
     paramDict = {'orientation': ParamOrientation, 'sashpos': ParamUnit, 'minsize': ParamUnit }
     winStyles = ['wxSP_3D', 'wxSP_3DSASH', 'wxSP_3DBORDER', 'wxSP_BORDER',
     allParams = ['orientation', 'sashpos', 'minsize', 'pos', 'size', 'style']
     paramDict = {'orientation': ParamOrientation, 'sashpos': ParamUnit, 'minsize': ParamUnit }
     winStyles = ['wxSP_3D', 'wxSP_3DSASH', 'wxSP_3DBORDER', 'wxSP_BORDER',

-                        'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE',
-                        'wxSP_NO_XP_THEME' ]
+                         'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE',
+                         'wxSP_NO_XP_THEME' ]

 
 class xxxGenericDirCtrl(xxxObject):
     allParams = ['defaultfolder', 'filter', 'defaultfilter', 'pos', 'size', 'style']
 
 class xxxGenericDirCtrl(xxxObject):
     allParams = ['defaultfolder', 'filter', 'defaultfilter', 'pos', 'size', 'style']