(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 cd373338857603c254e57514ae184bfc7f1249af..1fb1c81ebee34e696640277e1fa8f429658a8cec 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -49,7 +49,10 @@ 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):

-            self.textNode.data = unicode(value, g.currentEncoding)
+            try: # handle exception if encoding is wrong
+                self.textNode.data = unicode(value, g.currentEncoding)
+            except UnicodeDecodeError:
+                wxLogMessage("Unicode error: set encoding in file\nglobals.py to something appropriate")

 
 # Integer parameter
 class xxxParamInt(xxxParam):
 
 # Integer parameter
 class xxxParamInt(xxxParam):


@@ -235,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):


@@ -333,12 +338,10 @@ class xxxContainer(xxxObject):
 
 # Simulate normal parameter for encoding
 class xxxEncoding:
 
 # Simulate normal parameter for encoding
 class xxxEncoding:

-    def __init__(self, val):
-        self.encd = val

     def value(self):
     def value(self):

-        return self.encd
+        return g.currentEncoding

     def update(self, val):
     def update(self, val):

-        self.encd = val
+        g.currentEncoding = val

 
 # Special class for root node
 class xxxMainNode(xxxContainer):
 
 # Special class for root node
 class xxxMainNode(xxxContainer):


@@ -350,7 +353,7 @@ class xxxMainNode(xxxContainer):
         # Reset required parameters after processing XML, because encoding is
         # a little special
         self.required = ['encoding']
         # Reset required parameters after processing XML, because encoding is
         # a little special
         self.required = ['encoding']

-        self.params['encoding'] = xxxEncoding(dom.encoding)
+        self.params['encoding'] = xxxEncoding()

 
 ################################################################################
 # Top-level windwows
 
 ################################################################################
 # Top-level windwows


@@ -368,7 +371,7 @@ class xxxDialog(xxxContainer):
     required = ['title']
     default = {'title': ''}
     winStyles = ['wxDEFAULT_DIALOG_STYLE', 'wxSTAY_ON_TOP',
     required = ['title']
     default = {'title': ''}
     winStyles = ['wxDEFAULT_DIALOG_STYLE', 'wxSTAY_ON_TOP',

-                 'wxDIALOG_MODAL', 'wxDIALOG_MODELESS',
+##                 'wxDIALOG_MODAL', 'wxDIALOG_MODELESS',

                  'wxCAPTION', 'wxSYSTEM_MENU', 'wxRESIZE_BORDER', 'wxRESIZE_BOX',
                  'wxTHICK_FRAME',
                  'wxNO_3D', 'wxTAB_TRAVERSAL', 'wxCLIP_CHILDREN']
                  'wxCAPTION', 'wxSYSTEM_MENU', 'wxRESIZE_BORDER', 'wxRESIZE_BOX',
                  'wxTHICK_FRAME',
                  'wxNO_3D', 'wxTAB_TRAVERSAL', 'wxCLIP_CHILDREN']


@@ -415,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


@@ -496,6 +498,13 @@ class xxxNotebook(xxxContainer):
     paramDict = {'usenotebooksizer': ParamBool}
     winStyles = ['wxNB_FIXEDWIDTH', 'wxNB_LEFT', 'wxNB_RIGHT', 'wxNB_BOTTOM']
 
     paramDict = {'usenotebooksizer': ParamBool}
     winStyles = ['wxNB_FIXEDWIDTH', 'wxNB_LEFT', 'wxNB_RIGHT', 'wxNB_BOTTOM']
 

+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',
+                         'wxSP_NOBORDER', 'wxSP_PERMIT_UNSPLIT', 'wxSP_LIVE_UPDATE',
+                         'wxSP_NO_XP_THEME' ]
+

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


@@ -538,6 +547,11 @@ class xxxSpinCtrl(xxxObject):
     paramDict = {'value': ParamInt}
     winStyles = ['wxSP_HORIZONTAL', 'wxSP_VERTICAL', 'wxSP_ARROW_KEYS', 'wxSP_WRAP']
 
     paramDict = {'value': ParamInt}
     winStyles = ['wxSP_HORIZONTAL', 'wxSP_VERTICAL', 'wxSP_ARROW_KEYS', 'wxSP_WRAP']
 

+class xxxToggleButton(xxxObject):
+    allParams = ['label', 'checked', 'pos', 'size', 'style']
+    paramDict = {'checked': ParamBool}
+    required = ['label']
+

 ################################################################################
 # Boxes
 
 ################################################################################
 # Boxes
 


@@ -555,6 +569,8 @@ class xxxRadioBox(xxxObject):
 class xxxCheckBox(xxxObject):
     allParams = ['label', 'checked', 'pos', 'size', 'style']
     paramDict = {'checked': ParamBool}
 class xxxCheckBox(xxxObject):
     allParams = ['label', 'checked', 'pos', 'size', 'style']
     paramDict = {'checked': ParamBool}

+    winStyles = ['wxCHK_2STATE', 'wxCHK_3STATE', 'wxCHK_ALLOW_3RD_STATE_FOR_USER',
+                 'wxALIGN_RIGHT']

     required = ['label']
 
 class xxxComboBox(xxxObject):
     required = ['label']
 
 class xxxComboBox(xxxObject):


@@ -766,6 +782,7 @@ xxxDict = {
     'wxBitmapButton': xxxBitmapButton,
     'wxRadioButton': xxxRadioButton,
     'wxSpinButton': xxxSpinButton,
     'wxBitmapButton': xxxBitmapButton,
     'wxRadioButton': xxxRadioButton,
     'wxSpinButton': xxxSpinButton,

+    'wxToggleButton' : xxxToggleButton,

 
     'wxStaticBox': xxxStaticBox,
     'wxStaticBitmap': xxxStaticBitmap,
 
     'wxStaticBox': xxxStaticBox,
     'wxStaticBitmap': xxxStaticBitmap,


@@ -785,6 +802,7 @@ xxxDict = {
     'wxListCtrl': xxxListCtrl,
     'wxCheckListBox': xxxCheckList,
     'wxNotebook': xxxNotebook,
     'wxListCtrl': xxxListCtrl,
     'wxCheckListBox': xxxCheckList,
     'wxNotebook': xxxNotebook,

+    'wxSplitterWindow': xxxSplitterWindow,

     'notebookpage': xxxNotebookPage,
     'wxHtmlWindow': xxxHtmlWindow,
     'wxCalendarCtrl': xxxCalendarCtrl,
     'notebookpage': xxxNotebookPage,
     'wxHtmlWindow': xxxHtmlWindow,
     'wxCalendarCtrl': xxxCalendarCtrl,