Index: src/plugins/contrib/wxSmith/wxsmith/wxsBitmapIconEditorDlg.wxs
===================================================================
--- src/plugins/contrib/wxSmith/wxsmith/wxsBitmapIconEditorDlg.wxs    (revision 4051)
+++ src/plugins/contrib/wxSmith/wxsmith/wxsBitmapIconEditorDlg.wxs    (working copy)
@@ -1,198 +1,186 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <wxsmith>
     <object class="wxDialog" name="wxsBitmapIconEditorDlg">
         <title>Image editor</title>
-        <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxRESIZE_BOX</style>
+        <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
         <object class="wxBoxSizer" variable="BoxSizer1" member="yes">
             <orient>wxVERTICAL</orient>
             <object class="sizeritem">
-                <option>1</option>
-                <border>5</border>
-                <flag>wxALIGN_CENTER|wxEXPAND</flag>
                 <object class="wxBoxSizer" variable="BoxSizer5" member="yes">
-                    <orient>wxHORIZONTAL</orient>
                     <object class="sizeritem">
-                        <border>5</border>
-                        <flag>wxALL|wxALIGN_CENTER|wxEXPAND</flag>
                         <object class="wxStaticBoxSizer" variable="StaticBoxSizer1" member="yes">
-                            <orient>wxHORIZONTAL</orient>
                             <label>Image options</label>
                             <object class="sizeritem">
-                                <option>1</option>
-                                <border>5</border>
-                                <flag>wxALL|wxALIGN_CENTER|wxEXPAND</flag>
                                 <object class="wxFlexGridSizer" variable="FlexGridSizer1" member="yes">
-                                    <rows>0</rows>
                                     <cols>1</cols>
-                                    <vgap>0</vgap>
-                                    <hgap>0</hgap>
                                     <growablecols>1</growablecols>
                                     <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>5</border>
-                                        <flag>wxLEFT|wxRIGHT|wxTOP|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND</flag>
                                         <object class="wxRadioButton" name="ID_RADIOBUTTON1" variable="NoImage" member="yes">
                                             <label>No image</label>
-                                            <value>1</value>
-                                            <handler entry="EVT_RADIOBUTTON" function="OnUpdatePreview" />
+                                            <handler function="OnUpdatePreview" entry="EVT_RADIOBUTTON" />
                                         </object>
+                                        <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                                        <border>5</border>
+                                        <option>1</option>
                                     </object>
                                     <object class="spacer">
-                                        <size>1,1</size>
-                                        <option>1</option>
+                                        <flag>wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL</flag>
                                         <border>5</border>
-                                        <flag>wxALL|wxALIGN_CENTER</flag>
+                                        <option>1</option>
+                                        <size>1,1</size>
                                     </object>
                                     <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>5</border>
-                                        <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
                                         <object class="wxRadioButton" name="ID_RADIOBUTTON2" variable="ImageFile" member="yes">
                                             <label>Image From File:</label>
-                                            <handler entry="EVT_RADIOBUTTON" function="OnUpdatePreview" />
+                                            <handler function="OnUpdatePreview" entry="EVT_RADIOBUTTON" />
                                         </object>
+                                        <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
+                                        <border>5</border>
+                                        <option>1</option>
                                     </object>
                                     <object class="sizeritem">
-                                        <option>1</option>
-                                        <border>5</border>
-                                        <flag>wxALIGN_CENTER|wxEXPAND</
download for full patch...