diff --git a/wxPython/wxPython/tools/XRCed/CHANGES.txt b/wxPython/wxPython/tools/XRCed/CHANGES.txt
index 090c4eb29e..3945253906 100644
--- a/wxPython/wxPython/tools/XRCed/CHANGES.txt
+++ b/wxPython/wxPython/tools/XRCed/CHANGES.txt
@@ -1,3 +1,16 @@
+0.1.0
+-----
+
+Finally implemented tools panel for almost all controls (except
+wxHtmlWindow, wxCalendarCtrl and wxGenericDirCtrl - they are too
+rarely used).
+
+Changed some sizes in panel to better work with different fonts.
+
+Fixed double-refreshing after Ctrl+R.
+
+Maybe something else that I've forgot. It's been a looong day... :)
+
 0.0.9-6
 -------
 
diff --git a/wxPython/wxPython/tools/XRCed/globals.py b/wxPython/wxPython/tools/XRCed/globals.py
index 4cbf3ab3ec..3c7576a132 100644
--- a/wxPython/wxPython/tools/XRCed/globals.py
+++ b/wxPython/wxPython/tools/XRCed/globals.py
@@ -9,15 +9,18 @@ from wxPython.xrc import *
 
 # Global constants
 
+sysFont = wxSystemSettings_GetFont(wxSYS_SYSTEM_FONT)
 if wxPlatform == '__WXGTK__':
-    labelFont = wxFont(12, wxDEFAULT, wxNORMAL, wxBOLD)
-    modernFont = wxFont(12, wxMODERN, wxNORMAL, wxNORMAL)
+    labelFont = wxFont(sysFont.GetPointSize(), wxDEFAULT, wxNORMAL, wxBOLD)
+    modernFont = wxFont(sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
+    smallerFont = wxFont(sysFont.GetPointSize() - 2, wxDEFAULT, wxNORMAL, wxNORMAL)
 else:
     labelFont = wxFont(10, wxDEFAULT, wxNORMAL, wxBOLD)
     modernFont = wxFont(10, wxMODERN, wxNORMAL, wxNORMAL)
+    smallerFont = wxFont(8, wxDEFAULT, wxNORMAL, wxNORMAL)
 
 progname = 'XRCed'
-version = '0.0.9-6'
+version = '0.1.0'
 
 # Global variables
 
@@ -25,6 +28,7 @@ class Globals:
     panel = None
     tree = None
     frame = None
+    tools = None
     undoMan = None
     testWin = None
     testWinPos = wxDefaultPosition
diff --git a/wxPython/wxPython/tools/XRCed/images.py b/wxPython/wxPython/tools/XRCed/images.py
index b5d259e4c8..167959b681 100644
--- a/wxPython/wxPython/tools/XRCed/images.py
+++ b/wxPython/wxPython/tools/XRCed/images.py
@@ -583,12 +583,12 @@ def getTreeToolBarData():
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
 \x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
-\x00\x00yIDATx\x9c\xed\x93;\x0e\x80 \x10D\x1f\x86\x82\x92cPXp\\\x8e\xc3\x11(\
-,8\x8a\x85\x89\x16 1&\xf8\x81\xc6\xc2\xe9\x1e0\x93\t\x9b\x15Zkz4t\xb9?\x11 \
-\xe6e^[\xcdJ*$@\x8c\xf1\xb5\xd9{\x0f\x90\x02\x00\xcchS*\x10\xa6\x801\x99eb\
-\x9b\x99\xcc\xbb\xba\xff\xa04P\xa7\x0b%k/+\xc7\xc7ZO\xb8\x048\xe7nJ^K\x00\
-\xcdc\x04\x10\xff.\xb0\x01@\x9a\x1c\x89X\xd8\x00\xb4\x00\x00\x00\x00IEND\xae\
-B`\x82' 
+\x00\x00\x80IDATx\x9c\xed\x93\xbb\r\x840\x10D\x9f\x91\x03B\x97\xb1\x81\x83-\
+\xc1%\x12\\\xb0\xe5\xb8\x0c\x97B\x80\x04\x11\x1fs\xd2!pr\x01\x13\xf9i4#\xdb\
+\xabu!\x04Z\xd45\xa5\xff\xa2\xc0\x8d\xd38?\r\xf7\xbe\xc7\x03\x94Rn\x87s\xce\
+\xc0\xe1\t\x12\x15\x89\xba\x19"\x8a\xc8\xce*\x8a\x1exU\xf3\x1f\xf8\xf5`\x9f\
+\xa12\xccj\x1eN\xfcU\x90R\xaa\x8c+\xde\n\xcc\xec\xf2\x9a\xbf\xe4\x80\xc7c\
+\x04p\xef.\xb0\x00\xb2\x8f\x1d_"\xe3\xe1\xc9\x00\x00\x00\x00IEND\xaeB`\x82' 
 
 def getTreeToolBarBitmap():
     return wxBitmapFromImage(getTreeToolBarImage())
@@ -655,3 +655,1021 @@ def getRedoIcon():
     icon.CopyFromBitmap(getRedoBitmap())
     return icon
 
+#----------------------------------------------------------------------
+def getToolDefaultData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00QIDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4\x9b\x1a\x06\xb0\xa0\x0b\xbcx\xf3\
+\xe2?.\xc5\x1c,\x1c\x0c\x02\x02\x02\x8cx\r````\xb8q\xe3\x06\x86\xd8\x81\x03\
+\x07\xb0\x1a:\xf0a@\xfd@d`\xc0\xed_\xa2\x0c\xe0`\xe1 \xc9\x05\x8cC?%Rl\x00\
+\x00\xdc\x00\x0b\x9f\x8dZU\xfe\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolDefaultBitmap():
+    return wxBitmapFromImage(getToolDefaultImage())
+
+def getToolDefaultImage():
+    stream = cStringIO.StringIO(getToolDefaultData())
+    return wxImageFromStream(stream)
+
+def getToolDefaultIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolDefaultBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolDialogData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00IIDATx\x9ccd``\xf8\xcf@\x01`\x81P?\xc8\xd4\xce\xc1\xc0D\x89\xed\x0c\
+\x0c\x0c\x94\x1b\xc0\xc8@\x8d0\xb8p\xe5\x02Y\x9a\rt\x0c\x06A\x18\x8c$\x03\
+\x0e\x1c8@\x1b\x17\xb0\x90b\x1b\xd1\x06888\x10m\x00\xc5I\x19\x00\xe6)\x0cc\
+\xbf\x9c\xcc\xa1\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolDialogBitmap():
+    return wxBitmapFromImage(getToolDialogImage())
+
+def getToolDialogImage():
+    stream = cStringIO.StringIO(getToolDialogData())
+    return wxImageFromStream(stream)
+
+def getToolDialogIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolDialogBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolFrameData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00:IDATx\x9ccd``\xf8\xcf@\x01`\x81P?\xc8\xd4\xce\xc1\xc0D\x89\xed\x0c\
+\x0c\x0c\x94\x1b\xc0\xc8@\x8d0\xb8p\xe5\x02Y\x9a\rt\x0c\x06A\x18\x8c\x1a0,\
+\x0c\xa08)\x03\x00\x90c\x07\x1f\xb3yvF\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolFrameBitmap():
+    return wxBitmapFromImage(getToolFrameImage())
+
+def getToolFrameImage():
+    stream = cStringIO.StringIO(getToolFrameData())
+    return wxImageFromStream(stream)
+
+def getToolFrameIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolFrameBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMenuBarData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00bIDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4{P\x18\xc0\xf8\xe3\xcf\x8f\xff\
+\xe4j\xe6`\xe1``a```\xb8q\xe3\x06\xc9\x9a\x0f\x1c8\xc0\xc0\xc0\xc0\x001\x00Y\
+\x00\x19888\xe0\x14\x87\x81\x81\x0fD\xb8\x17\x90\x9d\x85\x0cp\x89\xc3\r\x981\
+c\x06E.`d`` ;\x1a\x19\x18\x18\x18\x18G\xf3\x02\x03\x00DO\x13\x93\xa7\xebQk\
+\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolMenuBarBitmap():
+    return wxBitmapFromImage(getToolMenuBarImage())
+
+def getToolMenuBarImage():
+    stream = cStringIO.StringIO(getToolMenuBarData())
+    return wxImageFromStream(stream)
+
+def getToolMenuBarIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolMenuBarBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMenuData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00]IDATx\x9cc\x14\x10\x10`\x80\x81\x17o^\xfcg \x02p\xb0p0\x08\x08\x080\
+2000\xb0\xa0K\xde\xb8q\x03\xaf\xe6\x03\x07\x0e\xa0\xf01\x0c\xc0\xa6\x08\x06\
+\x1c\x1c\x1c0\xc4\x98\xf0ZG\x04\xa0\xd8\x00\xac^\xc0\xe6T\x92\x0c\x18\r\x83\
+\xd10\xc0\xe5\x7f\xa2\x0c\xe0`\xe1 I3\x03\x03\x03\x03\x00l\xa5\x16\xbeals=\
+\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolMenuBitmap():
+    return wxBitmapFromImage(getToolMenuImage())
+
+def getToolMenuImage():
+    stream = cStringIO.StringIO(getToolMenuData())
+    return wxImageFromStream(stream)
+
+def getToolMenuIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolMenuBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolPanelData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00CIDATx\x9c\xed\xd31\x0e\x800\x0cC\xd1W\x94\xa1\xf7?Q\x8e\x91\xa3t@\x82\t\
+1\x131\xf6\xef\xfe^\xec\xb1\xceui2c\n\xa8\xaa\xcf\xe1\xcc\x04G\xb7\xfda\x0b\
+\xb6\xe0\x17A\xf0\xce\xb2\xc3@\xfbLp\x03\xeer\x0c%l\xbc\t6\x00\x00\x00\x00IE\
+ND\xaeB`\x82' 
+
+def getToolPanelBitmap():
+    return wxBitmapFromImage(getToolPanelImage())
+
+def getToolPanelImage():
+    stream = cStringIO.StringIO(getToolPanelData())
+    return wxImageFromStream(stream)
+
+def getToolPanelIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolPanelBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolRootData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00aIDATx\x9c\xed\x93\xcb\r\xc00\x08C\xa1\xea\x00\x1e\x83\xfd\xa7a\x0c6Ho\
+\x88"\x88\x1aq\xado|l\xf1"\x85\x01\xd0Dw\xd54\xb3\x15k\x00\xdc\x06\x88\xc8kY\
+U\xdb\xe5J\x0c\x80Dd\x9d\x1a\xfd\x82n\x901\xa2"\x92\x07D\x94\x93k< \x9bv\x0f\
+W\x06d\xfd\x08\xdf\x11x\xfa\x17\xae\x91\x9b\x88\x1e\xba\x12*2\xab=\t\xe9\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolRootBitmap():
+    return wxBitmapFromImage(getToolRootImage())
+
+def getToolRootImage():
+    stream = cStringIO.StringIO(getToolRootData())
+    return wxImageFromStream(stream)
+
+def getToolRootIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolRootBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolCheckBoxData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\n\x00\x00\x00\n\x08\x06\x00\
+\x00\x00\x8d2\xcf\xbd\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00?IDATx\x9cc\xfc\xf1\xe7\xc7\x7f\x06\x02\x80\x83\x85\x83\x81\x85\x81\x81\
+\x81\xe1\xc6\x8d\x1b\x84\xd420\x11Rp\xe0\xc0\x01\xe2\x14\x12m\xe2 P\xc8\x02c\
+\xc0|\x87\x0b0200\x10\x0cp\x06\x06\x06\x06\x00b\x8b\x0c\x1dT!\xdd>\x00\x00\
+\x00\x00IEND\xaeB`\x82' 
+
+def getToolCheckBoxBitmap():
+    return wxBitmapFromImage(getToolCheckBoxImage())
+
+def getToolCheckBoxImage():
+    stream = cStringIO.StringIO(getToolCheckBoxData())
+    return wxImageFromStream(stream)
+
+def getToolCheckBoxIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolCheckBoxBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getTreeToolData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00^IDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4\x9b\x1a\x06\xb0\xa0\x0b\xbcx\xf3\
+\xe2?>\r\x1c,\x1c\x0c\x02\x02\x02\x8c8\r````\xb8q\xe3\x06V\xcd\x07\x0e\x1c\
+\xc0\x10\xa3\xbe\x17p\xd9\xe8\xe0\xe0\x80U\xcd \x8c\x05d\x80\xcb\xd9\x04\r\
+\xc0\x16\xdaD\x1b\xc0\xc1\xc2A\xb4f\x06\x06\x06\x06\xc6\x01\xcf\x0b\x00"\x92\
+\x0fc\x04\xf8\xbb\xc7\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeToolBitmap():
+    return wxBitmapFromImage(getTreeToolImage())
+
+def getTreeToolImage():
+    stream = cStringIO.StringIO(getTreeToolData())
+    return wxImageFromStream(stream)
+
+def getTreeToolIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getTreeToolBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolToolData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\t\x00\x00\x00\t\x08\x06\x00\
+\x00\x00\xe0\x91\x06\x10\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00LIDATx\x9c\x95\xd0\xb1\r\xc0 \x10C\xd1GD\xc1X\x8c\xce\x18\x8cB\x11)\
+\xa9\x12!qB\xc9\xaf\xae\xf0\xd9\x96\xd38\xc7eC\xc9E\x86\xde{(h\xad\x81c\xe7\
+\xf2\x90\xa3O\xa8\xb5\xbe\xf7\'\xa7\xffqs\xc4"\x9a\xbbD$lw\x82\x1b\xd7\x84\
+\x0f\xdfLT\x19\x1d\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolToolBitmap():
+    return wxBitmapFromImage(getToolToolImage())
+
+def getToolToolImage():
+    stream = cStringIO.StringIO(getToolToolData())
+    return wxImageFromStream(stream)
+
+def getToolToolIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolToolBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolMenuItemData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0c\x00\x00\x00\t\x08\x06\
+\x00\x00\x00\x06\xb8\xcdT\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00NIDATx\x9cc\xfc\xf1\xe7\xc7\x7f\x06"\x01\x07\x0b\x07\x03\x0b\x03\x03\
+\x03\xc3\x8d\x1b7\x08*>p\xe0\x00\x03\x03\x03\x03\x03\x13\xb1\xa6\xc3\x00\x0b\
+6S\xd0\x81\x83\x83\x03\x9cM\xb2\r\x949\t\xd9j\xbc\x1ap\xb9\x1d\x1b`d`` :\x1e\
+\x18\x18\x18\x18\x00h[\x0f\xdf\xbb\xf3\x12\xf4\x00\x00\x00\x00IEND\xaeB`\x82\
+' 
+
+def getToolMenuItemBitmap():
+    return wxBitmapFromImage(getToolMenuItemImage())
+
+def getToolMenuItemImage():
+    stream = cStringIO.StringIO(getToolMenuItemData())
+    return wxImageFromStream(stream)
+
+def getToolMenuItemIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolMenuItemBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolFlexGridSizerData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00BIDATx\x9cc\x14\x10\x10`\x08\x08\t\xf8\xcf@&`\x8116\xac\xd9\xc0\x88,\
+\x11\x10\x12\xf0\x1f]\x0c\x1d\x04\x84\x04\xfcg"\xd7f\x18\x18x\x03\x18G\x03q\
+\xd4\x00j\x18@qBb\x14\x10\x10\xa0\xc8\x05\x00\xb4+\x16\xba\x9e\xe7\x8fF\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolFlexGridSizerBitmap():
+    return wxBitmapFromImage(getToolFlexGridSizerImage())
+
+def getToolFlexGridSizerImage():
+    stream = cStringIO.StringIO(getToolFlexGridSizerData())
+    return wxImageFromStream(stream)
+
+def getToolFlexGridSizerIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolFlexGridSizerBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getTreeMenuItemData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00cIDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4\x9b\x81\x81\x81\x05\xc6x\xf1\xe6\
+\xc5\x7fb5q\xb0p0\x08\x08\x080\xa2\x18\xc0\xc0\xc0\xc0p\xe3\xc6\r\x82\x9a\
+\x0f\x1c8\x80\xc2\xa7\x9e\x17\xf0\xd9\x02\x03\x0e\x0e\x0e\x18b\x14\xbb\x806^\
+\xc0\xe6T\xa2\x0c\xc0\xe5w\xa2\x0c\xe0`\xe1 Y3\x03\x03\x03\x03\xe3\x80\'e\
+\x8a\r\x00\x00GI\x0fc!\x9f\xc7\x01\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeMenuItemBitmap():
+    return wxBitmapFromImage(getTreeMenuItemImage())
+
+def getTreeMenuItemImage():
+    stream = cStringIO.StringIO(getTreeMenuItemData())
+    return wxImageFromStream(stream)
+
+def getTreeMenuItemIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getTreeMenuItemBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolToolBarData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x08\x08\x06\
+\x00\x00\x00\xf0v\x7f\x97\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00lIDATx\x9c\xa5\x91\xb1\r\x800\x0c\x04\x0f\x94\x82Q\\Px\x84\x8c\x98\
+\x82\xc2\xe3d\x8c\x8cB\x81\x04U\x02\x01\x89\x88p\x95\xcf/[\x96<\xac\xdb\xba\
+\xd3\xc9\xe4&\x1c@J\xe9\xf3p\x8c\x11\x8017dVd\xd6\x12\x88("\xa7\xab(z\xf1\
+\xcc\xc8O\\.l\tU`V{\xb8\xf9c\x81\xf7\xbe\nZ^\x16\x98Y\xf3\xcc7\x06\xa0\xfb\
+\x8d\x00\x07:\x91\x1c\xf1\xcb\xec\x06\xb4\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolToolBarBitmap():
+    return wxBitmapFromImage(getToolToolBarImage())
+
+def getToolToolBarImage():
+    stream = cStringIO.StringIO(getToolToolBarData())
+    return wxImageFromStream(stream)
+
+def getToolToolBarIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolToolBarBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolChoiceData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x0c$\xbf\x95\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\x91IDATx\x9c\xbd\x94=\x0e\x80 \x0c\x85\x1f\xa6C\x8f\xc2\xe0\xc0\xfd\
+\'\x8e\xc0\xe0\xc0Q\x18Lt\xc2(P\x84\xc4\xfa-$M\xd3\xd7_L\xda\xd3\x01%\x98\
+\x18\x04\x001F-\r,Z\x81\xbd\xf7}\x01\xb7\xbaO\x84\xd4*\xc8P\xcb\xe8V\x87\xb0\
+\x85\xeb\xbdc\xad\x15\x831q\xe5\xdf\x14xcf)\xaa\x16\xdd\xb3\xceU\x8c\x90\x87\
+Z"\xb6\xe8+\x1e\x02\xad\x9eKv)\xe3\xae\xc0\x08L<\xe5\xff\x10he_\xda%\x1f\t\
+\xf5;\xf8\xef\xd0F\x876\x8b\x01\xa0\xf6]\x03\xc0\t\'\xec0\xc5\xed<\xbeO\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolChoiceBitmap():
+    return wxBitmapFromImage(getToolChoiceImage())
+
+def getToolChoiceImage():
+    stream = cStringIO.StringIO(getToolChoiceData())
+    return wxImageFromStream(stream)
+
+def getToolChoiceIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolChoiceBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolSpacerData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00/IDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4\x9b&\x06|\xf8\xf0\xe1?14\x0c0R=\
+\x0c\xd0m $?\xea\x02Z\xba`\xe0\xd2\x01\xa9\x00\x00`~>\'\xaa4\xf4\x95\x00\x00\
+\x00\x00IEND\xaeB`\x82' 
+
+def getToolSpacerBitmap():
+    return wxBitmapFromImage(getToolSpacerImage())
+
+def getToolSpacerImage():
+    stream = cStringIO.StringIO(getToolSpacerData())
+    return wxImageFromStream(stream)
+
+def getToolSpacerIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolSpacerBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolStaticTextData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x16\x00\x00\x00\r\x08\x06\
+\x00\x00\x00\xad\xa5\x9ec\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00kIDATx\x9c\xd5SA\n\xc00\x08\xd3\xb1\x07\xe4\xff\xaf\xcc\x0f\xdcIp%\
+\x0e\xdaQ\xc6r3\xda$\nu\x00\xb6\x03\xc7\x16\xd5O\x84I\xc6S\xbd,\xfc\x16R\x98\
+d\x00p\x95\x92d\xa8mFn*q\x1aVS\xc5I\xe1\x1c43\x1b\x87\x93\xefP\xfbg\x97lf\
+\x13\x85\x9bpM\xab\x8c\xba\xbez/\x13w\xa8\xa7Q\xe7\xaa\xa6\xfe\xbb/}\x01*\
+\x1bS\x8a\xc2\x15\xd1\x9d\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolStaticTextBitmap():
+    return wxBitmapFromImage(getToolStaticTextImage())
+
+def getToolStaticTextImage():
+    stream = cStringIO.StringIO(getToolStaticTextData())
+    return wxImageFromStream(stream)
+
+def getToolStaticTextIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolStaticTextBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolTextCtrlData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x0c$\xbf\x95\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00HIDATx\x9cc\x9c0e\xc2\x7f\x06\x1a\x02\x16\x06\x06\x06\x86\x82\x9c\
+\x02\x9a\x18\xfe\xe3\xcf\x0f\x88\x050\x0e5\xc1\x8d\x1b7\x18\x18\x18\x18\x18\
+\x98\xa8j*\x160j\xc1\xa8\x05\xa3\x16\x0c\x07\x0b\xe0e\x11\xac\xec\xa0\x89\
+\x05\xd4.\xe8\x90\x01\x00\x81\x02\x11\xfb\x02\xab> \x00\x00\x00\x00IEND\xaeB\
+`\x82' 
+
+def getToolTextCtrlBitmap():
+    return wxBitmapFromImage(getToolTextCtrlImage())
+
+def getToolTextCtrlImage():
+    stream = cStringIO.StringIO(getToolTextCtrlData())
+    return wxImageFromStream(stream)
+
+def getToolTextCtrlIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolTextCtrlBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolButtonData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x0c$\xbf\x95\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\x84IDATx\x9c\xc5\x941\n\xc0 \x0cE\x9f\xc5\xc1\xc3t\xe8\xfd\'\x8f\
+\x90\xc1\xc1\xa38\x14\xda\xc9B\xa5\xc6B\r\xfd\xe0`\x82\xff\x91\x18\xe2\xca^\
+\x0e\x8c\x14|\xc0\x03\xe4\x9c\xad\x18,V\xc61F[@\x95\n\xd8\xd6\xedv\xda\x9cv\
+\xaf\xf2\x9a\xb9$\x19\xc6\xb48Lh\x91f\xfe\x19\xd0k\xcb4\x80$A\x92\xa8\xa0\
+\x7f\xa7\xe8\xad\xb4*\xbaS\xf4\xf4H\xfb\xcc\x9e\xba\x80\x91a\x9b3\x1b\xd3\
+\x91\xae\n\xea\xee\x98-\x07\x98\xadk\x80\x13\xd4\x8e1G9C\xf0\xc0\x00\x00\x00\
+\x00IEND\xaeB`\x82' 
+
+def getToolButtonBitmap():
+    return wxBitmapFromImage(getToolButtonImage())
+
+def getToolButtonImage():
+    stream = cStringIO.StringIO(getToolButtonData())
+    return wxImageFromStream(stream)
+
+def getToolButtonIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolButtonBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolBitmapButtonData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x02\x05IDATx\x9c\xb5\x96-\x90\xda@\x18\x86\x9f\xebD\xac\xa8X\x81\x88DT\xac\
+\xa8@"N *"N *NT \x10\x88\x13\x88\x8a\x08\x042\xa2"\x02\x11\x89\xa8@\x9c@T ND\
+ "*"\x10\x11\x15\x11\'VT\xac@|"3\xad\xa0i\xa7\x1d\x08\xe1\xa6\xbcr\'\xfb>\
+\xfb~\xfb\xf3\xe5F*\xf9\xc1\x95\xa4<\x85\x07P\x14\xc5\xb5\x18\xbc\xba\x96q\
+\x9a\xa6\xd7\x05\xd4\xf2\xda|d\x8c9:\xde\xa6\xb4\x8d\t\x8c1\xbf\xcde/\xe4_s\
+\x9csg\xc1\xad\x00\xf5\xe4l\x9b\x11N\'\xc8\xf7\x04\xe3g`\x97l\x1e\xe7\x8cF\
+\xc3V\x90\xc6\x04\xd96\xc3\xf7\x15\xe1\x83Aw\xfa(=@w4\x83[\x9f\xe8c\x9f\xd1\
+\x87\xd1Y\xc8Q@=!^\xc4\xf8^\x8a\xee\x0c\xc0\xeb\x82\xa7\xe1u\x80\xf2\x14Zk\
+\xc2\xb1\xcf\xfd\xfb\xfb\x97\'\x98\x8e\x03P\x1a\x94\x7f\x18\xa8\x04*A*\x85\
+\xf2@w\x14Z\xab\xc6\x14\x8d\x00\x91\x83\xe1A\n<\x8d\xc8a\x93\x05\x05\x9e\xc2\
+\xd7r\xda\xe0\x14\xa0>~\xd1b\xfd\x0b P9\x90\x12*\xfb\'\x89s\xac\x1e\xd3\xcb\
+\x01\xb5\x92$A*\x0e\x86\x9eB\xa4\x04\x1cT\x82\xb5\x96\xf2\xd91\x8f\xe2\xbf\
+\x16\xf5\xaf\x1a/\x9aR\n%\x02(d_B\xe5\x10qXk\x91\xbd\x10%\x05\x9b\xa7\xa41\
+\xc1I@Q\x14$IL\x9e\xa5t\xdfd\xc4\xb3\x01\xce9\xcag\xcb\xfcS\x8a\xee\x186Oi\
+\xe3\xea\xe1l\x89\x96\xf8]C8\x8b(\xf7}\xa6Q\xc6f+,?oX\x7fY\x9f5oL\x000\xbc\
+\x0bX\xad\xd6\xe4yN8\x9b\xd3\xeb\xf5\x08\xc3\x10\xadu\xeb\'\xfed\x82\xe0]\
+\xc0\xe4a\xca\xf0. \xdb\xa6\x18cX.\x97Xk/\xea\x1f\'\x01\xd6Z\xa2h\xced2\xa5\
+\x7f;\xa0\xd8\x15h\xad[\x1b\xd7:Y\xa2|\x97\xd3{\xdb\xa3\xfc6\xc1\xf7}\xfa\
+\xfd\x01\xf1"\xbe\x18p\xb6\xe1\x88\x08EQ0\x1a\x8f.6\x873\x9b\x9c\xef\xf2\x17\
+\x99\x1e\x05\xd4=\xf4\x7f\xeb\x06\xb8\xdao\x0b\xc0O\x923\xdby\x95O\x1dg\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolBitmapButtonBitmap():
+    return wxBitmapFromImage(getToolBitmapButtonImage())
+
+def getToolBitmapButtonImage():
+    stream = cStringIO.StringIO(getToolBitmapButtonData())
+    return wxImageFromStream(stream)
+
+def getToolBitmapButtonIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolBitmapButtonBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolRadioButtonData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0b\x00\x00\x00\x0b\x08\x06\
+\x00\x00\x00\xa9\xacw&\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\x86IDATx\x9cu\xd0\xa1\x11\xc30\x0c\x85\xe1_\x9e@  C\x14\x04\x1ad0\x8f\
+\xa0\xc1\n\x02\x03:D\x80\x817HQZUQ\x1f\xb1\xcf\xf7=\xebN\xa2\xaa\xc4\xb4\xd6\
+N3\x93\xf8^2\xe8\xcf\xbf\xd8A\xb2B\xc9\xe0\xfe\xda\xd3B\xc9 \x90\x16\xc4\xcc\
+n\xd0gy,\x98\x19\x00\xa2\xaa\x1c\xfd8\x01\xb6\xe7\x86N\xdf\xed\x8c>\xa8k\x05\
+`\x9ef)\xd7\x05\xa0\xae\x95\xd1G\n??_\xf1\x13"\xbca_\x88\xf0gu\x11D\x08\xf0\
+\x06\x99\xd2L\tb\x83\xa4(\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolRadioButtonBitmap():
+    return wxBitmapFromImage(getToolRadioButtonImage())
+
+def getToolRadioButtonImage():
+    stream = cStringIO.StringIO(getToolRadioButtonData())
+    return wxImageFromStream(stream)
+
+def getToolRadioButtonIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolRadioButtonBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolSpinButtonData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\t\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\xc4HUC\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\x8dIDATx\x9c\x9d\x90\xb1\r\xc30\x0c\x04_\x86\x07\xf8ARx\x04\r\xe4B\xa3\
+\xa8\xf0@\x1aC#\xa8P\xc1\xd2\x85\x01\xa6\xa2c\xcb\x91\x1d\x84\xc07\xe4\x01\
+\xff|G\x12O3\xb4\x8bR\x8b\xdeB\xa5\x16\xcd9CD\xf4+d\x00\x00\xc4%\x9e\xc0\xa1\
+\x05\x00\xc0{\x7f\x02G;\xa4\x94\xfa\xc9\xd7mU\x00\xb7r\x7fU\xd0\xb5\xeb).\
+\xf1c\xd7~g\x8f\x849\x80\xa4\xdb3\xb5\xe0\xf4\x9a@\xd2u3]\xea \xb9\xeb\x98\
+\xe3\xb8\xbfT "j66?\xf5\xf4\x06%\x06t\x8fl^\xaef\x00\x00\x00\x00IEND\xaeB`\
+\x82' 
+
+def getToolSpinButtonBitmap():
+    return wxBitmapFromImage(getToolSpinButtonImage())
+
+def getToolSpinButtonImage():
+    stream = cStringIO.StringIO(getToolSpinButtonData())
+    return wxImageFromStream(stream)
+
+def getToolSpinButtonIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolSpinButtonBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolStaticBoxData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x16\x08\x06\
+\x00\x00\x00\xda}\\\x88\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\xa2IDATx\x9c\xedU1\n\xc30\x0c\x94\x82\x1f\xa0!\x83\x9f\xa8gx\xc8\
+\x032t\xf0\x13=d\xd0\x98\xa1\xe0N*IH\xe5 ZB\xc17\xd9`\xdd\xe9\xc4\t#\x11\x81\
+\x05\x11\xa9D\x84\xe6#\x03\x83\xb7\xf0+\x02\xda\xbd\x88T\xaf@HS\xda\x1533\
+\xc41\x9a#)K\xa99\xe7&93C\xd0\x83B\xc9\xb7\xb3W\x17z\x8fc\xc4\xb2\x94K\xae\
+\xc2\x91x\x0bk4-\x97iJ\xf5\xed\xe0\x8c\xf8,9\x9eD\xdd\x93\xa2O]z\xf6\xe1\xde\
+=\xe8\x02]\xa0\x0b\xfc\x89\x00\xce\x8f\xd9\xfd[\xb5\xc0\xcc\x80\xebs\xfd\x99\
+\x00\x00\xc0\x0b\xb9:<\xe6\x18V\xd1\xdf\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolStaticBoxBitmap():
+    return wxBitmapFromImage(getToolStaticBoxImage())
+
+def getToolStaticBoxImage():
+    stream = cStringIO.StringIO(getToolStaticBoxData())
+    return wxImageFromStream(stream)
+
+def getToolStaticBoxIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolStaticBoxBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolRadioBoxData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x16\x08\x06\
+\x00\x00\x00\xda}\\\x88\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x01\x05IDATx\x9c\xc5\x94!\x12\x830\x10E\x7f:\x1c \x02\xc1Q\x10=\xd0JD\
+\x05\x12Q\x81\xac\xa8\xe0@\x15HD\x0f\x11\x11\xb1\x12\xd1\x99T\x85\x06\x1a\
+\x926\xd0\xe9*\x92a\xdf\xcb\xeel"\xa4\x94\x08\x053\x1b)\xa5\x08\xfe\x14\x88C\
+j\xe2.\x02{zf6\xa9\x82\xac97\xb3d"B\x91\x17\xc1\x96(\xadL\xd7uQ8\x11!\xb3\
+\x1f6,\xdc\xed\xbd\xad\xc2\xae\x8b\xbc\x10J\xab\x8f\xaa\xca\x96`7B\xad\x89U\
+\xd9\x9c\x1b3U\xe0\x03\xfb&\'e\xa2\xfe3E\xee)\xeb\xba6\xbe\xfdM\x82%\xdc\x95\
+\xec&p\xe0\xb3\xf5.\x02\x17>\xdc\x87M\x927\xc1\x12\x0e`\x93d&\xf0\xc1m\xa4Jf\
+\xf7\xa0m[\xa1\xb42\xd5\xa9B\x7f\xeb!\xf3\xd7K\xcb\x9a1>F\x00\xf1K\xb6Z\x81\
+\x9b\\\x1eK\xb0\xe6\t^\x1e\xcb\xaf\xe1^\x81O\x92\n_\x15,%\xa9\xf0\xa0\xc0\
+\x85\xa6\xc2\xa3\x82\xadp\x00\x10\x97\xeb%\xf9\x19\x88\x05\x11A\x8c\x8f\xf1g\
+\x02\x00x\x02J\xca\x8a\xcbs\xe5\x05\x0f\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolRadioBoxBitmap():
+    return wxBitmapFromImage(getToolRadioBoxImage())
+
+def getToolRadioBoxImage():
+    stream = cStringIO.StringIO(getToolRadioBoxData())
+    return wxImageFromStream(stream)
+
+def getToolRadioBoxIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolRadioBoxBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolComboBoxData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x0c$\xbf\x95\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\xc3IDATx\x9c\xb5\x94\xc1\r\xc3 \x0cE\x7f+\x1f<\n\xa3\xe4\xd0\x03\
+\x83\xf4\x90q\x18\x83\x11\x18!\x87\x1e\x18\x85C\xa4\xf6\x04\n\x01SH\xe9\x93P\
+$\xb0\xfe\xc76\xce\xcdZ\xfbF\x07\xcbc\xe9\t\xcb`b\x10\x00h\xad\x9b\x81a\x0f\
+\x00\x00\xef\xfd\xb0\t\x9dEf\xe1\x9c\x03\x00\xdc\xa7\xaaV\xa8\x1a0\xf14\x03\
+\xfa\x1e\x92\xa3\x94\x12\xcf\x8c1X\x9f+\xb6\xd7&\x1b01\xc2\x1e\xd2\xf7\x8c\
+\xf7\x1eJ\xa9\xa2\xe1\xce\xb9B\x1c\xb8\xd8\x83hr\xa4&^\x18\x1co\x1d\xb3\xe8!\
+\xbe\x98\x1aE\x06L\x9cV\x8b\x98\x85T\x9aH\xea\x81Tsi?\x9a\xb4\xc4\xab\x19\
+\x8c\xd2\x12\xcf\x0c\xa4[\xfe:\xe1\x7f\x9f\xe4\xe1Ak\xbd\x18\xd1\xa0\xa7\x0c\
+W\x7f\x1f\x1f\x92\xc6Yif\xadRe\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolComboBoxBitmap():
+    return wxBitmapFromImage(getToolComboBoxImage())
+
+def getToolComboBoxImage():
+    stream = cStringIO.StringIO(getToolComboBoxData())
+    return wxImageFromStream(stream)
+
+def getToolComboBoxIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolComboBoxBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolListBoxData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x16\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xfe\xbe\rK\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\x91IDATx\x9c\xe5\x95=\n\xc0 \x0c\x85_\x8b\x83\x87\xed\xe0Q\x1cz8\
+\x8f\x92Ah\x87"H1\xa21:\xb4o\xf3\x87\xe7\xe3\x8b!\x9b?\xfd\x85\t2\x00\xe0\
+\x0e\xa7jJ\x91\x1e\xe3\xb4\xd0P\x08\x01\x00\xb0\xd7.Yc\xc5\x0fT\x8dG\xc4\x1a\
+[cA\x91\xc4\xa9\xd7&Ni\x01\x88S\x1b\xee`\xa4pE\xe3<m\xcb>\xa7u\x8c\xb9T\xbd\
+\rTd\xfc\xe6+\xe9J\xb6x\xb9Y/_`"\xe3\xa6\xef\xf6\x0f\x14\x1fa\xac1M\xe6\xa3H\
+\xb3J\xd5Xk\x90\xe6\xba\x01\xea\xbe>\xf3\x9d/\x83Q\x00\x00\x00\x00IEND\xaeB`\
+\x82' 
+
+def getToolListBoxBitmap():
+    return wxBitmapFromImage(getToolListBoxImage())
+
+def getToolListBoxImage():
+    stream = cStringIO.StringIO(getToolListBoxData())
+    return wxImageFromStream(stream)
+
+def getToolListBoxIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolListBoxBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolStaticLineData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x14\x00\x00\x00\x02\x08\x06\
+\x00\x00\x00X\x06\xfc\x8b\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\x19IDATx\x9cc\x9c0e\xc2\x7f\x06*\x81\x8c\x8c\x0c\x06\x16\x18\x83Z\
+\x00\x00rP\x05)\xab\x92\xb7?\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolStaticLineBitmap():
+    return wxBitmapFromImage(getToolStaticLineImage())
+
+def getToolStaticLineImage():
+    stream = cStringIO.StringIO(getToolStaticLineData())
+    return wxImageFromStream(stream)
+
+def getToolStaticLineIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolStaticLineBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolStaticBitmapData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0e\x00\x00\x00\x11\x08\x06\
+\x00\x00\x00\xed\xc8\x9d\x9f\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\
+\x00\x00\x01\xceIDATx\x9c}\x93\x9f\x93#A\x14\x80\xbf\xa4\x06\x1a\x0e\x1e\x04\
+\x1a\x03\x07\xf9\x13\x02\x07\x03\x07\x03\x07\x81\x85\xc0\xe1\xc2\xc2\xc1\xc0\
+A\xe0 8\xb0\x10X\x08\x0e,\x04\x16\x02\x0b\x07\x07\x81\x85\x81\x85\x81\xc0\
+\xc0A`\xa1!\xd0\x10x\xd0U}\x90\x9d\xb9ds{\xaf\xaa\xab\xba_\xbf\xaf\xdf\xcf\
+\xee\x89\x08\xa7\xe2\xf6.\xf2\x0f\xb1\x03\xdb;=\xf7O\x81\x16\xd2\x83R?\xd7x\
+\xef\xdf}\xb0\'"\x9d\xb2z\xaaX?\x94\xcc\xf2\x11&1\xe8A\xa9\xb6\x9e\xd5cMY\
+\xae\xcf<w`\xf5Ta\xadA\xd8 v\x0c\x08h\x85\x06\xc5\xef=\xb3\xa2\xa1\xbc/;\xb8\
+\xdfz[\xdc-\xb0\xc9\x06\x19\xa4\x90\x0c!\x11\xf8\x90a\x12\x83\x880\xbb\xb6L\
+\xaf\xa6]\xa8I\xbb\xc9\xaf30\x80\xb1GEP\x004\x18L\xa2\xc8\xc0 b\xba|\xbb\xe2\
+\xa8jg\x0c\x06\x12A\xf5X\x1c\xc5@b\xb0\xd2\xdeC\xbfM\xb6\xb8[\xbf\x82\n\xc1\
+\x83\xee \xb8\xa3.(\xea=\xab\x87\xcde;\x96\xcb%\x1a^CL\x0c\xaa;\xc0CP\x9cs\
+\xec^<\xf3b\xd1\x15\xa7\xcb\xd1\x18\x83Q\x05\x0cz\xd8A\xf0\xa8z\x9cs\xe8A)\
+\x96\r?\x7f-\xcf\xfb\x080\xfd:\x89u\xb5a\xf8q\xc4\xe2G\x8a\xf7\x9e\xdd\x8bc~\
+\xbbA\x06#\xd6\x8f\xe7}DD\x10\x11H\x88\x93\xab,\xd6\xdb:V\xd5&f_\xd2\x98\x7f\
+\x9b\xc6\xa6i\xa2\x06\x8d\x1a4\xb6\xb6"\xf2\x17\x9cL\xb2\xa8Ac\xf5\\\xc5\xf4\
+s\x1a\xf3\xefyt{w\x01\xb4\xab\'"\x18cby_\xb2\xb8-\xc8\xb2\x8c\xe6\xf7\x8e\
+\xd5j\x05\x81\xb3\xc1>\x95>\x80s\x8e\xa2\x98ss\x933\xfe\x94\xd2l\x1b\xde\xfe\
+\x9a\xb7\xd2\x15\xc7{\x1f\x87C\x8b\xb5\x96\xf18\xa5,\xcbw\xbd]\x80\xd6\xcaq\
+\x820\xff\x85\x00\xfe\x00df\xf8-\xfbB\xb7\xb6\x00\x00\x00\x00IEND\xaeB`\x82'\
+ 
+
+def getToolStaticBitmapBitmap():
+    return wxBitmapFromImage(getToolStaticBitmapImage())
+
+def getToolStaticBitmapImage():
+    stream = cStringIO.StringIO(getToolStaticBitmapData())
+    return wxImageFromStream(stream)
+
+def getToolStaticBitmapIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolStaticBitmapBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolSliderData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x005\xf8\xdc~\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\x80IDATx\x9c\xdd\x92\xb1\r\x800\x10\x03\x0f\x94"#Q0PF\xc8\x08\x19\xcbcd\
+\x94\x14HP \x84\x04\x08>\n4\xb8\xfcO|\xd6\xcb]Ji\xe6C9\x80\x18\xe3\'\xe6e*+\
+\x00@\x12\xc38\x98>z\xe7\x91dz\xeb\x8e\x83\x9c\xb31\x9fM\xfd\xddR\xd2)\xa95\
+\xb9\t\x00\x10B\xa82\xac\x06\xb4\xea\xe7\x80\xd6\xfb\xc3EMaoJmc\x1e\x01\xde\
+\xf9f\xc3[\xc0\x1b\x89/\x01e*\xaf\x1boZ\x00\xcau!\xcd\n\x1f\x13Q\x00\x00\x00\
+\x00IEND\xaeB`\x82' 
+
+def getToolSliderBitmap():
+    return wxBitmapFromImage(getToolSliderImage())
+
+def getToolSliderImage():
+    stream = cStringIO.StringIO(getToolSliderData())
+    return wxImageFromStream(stream)
+
+def getToolSliderIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolSliderBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolGaugeData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x005\xf8\xdc~\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00cIDATx\x9cc\x9c0e\xc2\x7f\x06\x1a\x02\x16\x06\x06\x06\x86\x82\x9c\x02\
+\x9a\x18\xfe\xe3\xcf\x0f\x88\x050\x0e.\xc0\xc1\xc2\xc1p\xe1\xca\x05\xb2,aA\
+\xe6|x\xf3\x81,C\xf0\x01&B\nv\xec\xd9A[\x0b(\x05\xa3\x16\x0c\xbc\x05,\xe8\
+\x02\x94\xa6\x1a\x9c\x16p\xb0pP\xd5`\x0c\x0b\xc8\xcd\xa9DY\x80\xaf\x98\xa0\
+\x14\x00\x00+\xec\x19!J\x0e\x8b\xa6\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolGaugeBitmap():
+    return wxBitmapFromImage(getToolGaugeImage())
+
+def getToolGaugeImage():
+    stream = cStringIO.StringIO(getToolGaugeData())
+    return wxImageFromStream(stream)
+
+def getToolGaugeIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolGaugeBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolScrollBarData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\r\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00!\xf0wT\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xd1IDATx\x9c\xa5\x94\xb1\r\x830\x10E_"\x17\x1e\x85\x11\\P\xdc@)(\x19\
+\x81\x92"\x05\xe3PPx\x04\x0f\x91\x82\x92"RR P8l\xcb(\xaf\x04\x1e\xff\xfc\x0f\
+q\xeb\xba\xee\xc3E\x0c@\xdb\xb6\xc5\xc2\xf2^V\t`\x1c\xc7\xc3MW;\xfc\xe4\xa3\
+\xe2=v\xd1\xd5\x8e\x10\x02"R&m\x02@\xff\xec\xa3\xe2=%\x00\x88HT4(\xf4\xd9b\
+\xec\x92\xab\x1d\xd6\xd8\xe4\x83"\xb2\xbfp\x97\xfc\xe4\x8bRNI9\xac\xb1\xe7$\
+\xe0PB\x8e\xe8\x9e4z\xec"I\xf3_\xe5\xb9\xba\x93Ri\xdd\x07)W\xf90\x0c4\x8f&\
+\xbe\\\xfd\xedm\x13\xfc\n\xa0\xda\xf3\x93\xa7\xaa\xaa\x83\xa4\x85\x93\xa4I\
+\x9d\xf3$mi\xb1\xb1\xb2I!\x84\xa4\x90\x94\xe6\xd7\x9c]\x81\x81\xf5\x0fs\x85/\
+K\xf5c\xf9\x89\xca\xe1|\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolScrollBarBitmap():
+    return wxBitmapFromImage(getToolScrollBarImage())
+
+def getToolScrollBarImage():
+    stream = cStringIO.StringIO(getToolScrollBarData())
+    return wxImageFromStream(stream)
+
+def getToolScrollBarIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolScrollBarBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolTreeCtrlData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00aIDATx\x9c\xed\x93\xcb\r\xc00\x08C\xa1\xea\x00\x1e\x83\xfd\xa7a\x0c6Ho\
+\x88"\x88\x1aq\xado|l\xf1"\x85\x01\xd0Dw\xd54\xb3\x15k\x00\xdc\x06\x88\xc8kY\
+U\xdb\xe5J\x0c\x80Dd\x9d\x1a\xfd\x82n\x901\xa2"\x92\x07D\x94\x93k< \x9bv\x0f\
+W\x06d\xfd\x08\xdf\x11x\xfa\x17\xae\x91\x9b\x88\x1e\xba\x12*2\xab=\t\xe9\x00\
+\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolTreeCtrlBitmap():
+    return wxBitmapFromImage(getToolTreeCtrlImage())
+
+def getToolTreeCtrlImage():
+    stream = cStringIO.StringIO(getToolTreeCtrlData())
+    return wxImageFromStream(stream)
+
+def getToolTreeCtrlIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolTreeCtrlBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolListCtrlData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x16\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xfe\xbe\rK\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00}IDATx\x9cc\x9c0e\xc2\x7f\x06\x1a\x00\x16\x06\x06\x06\x86\x82\x9c\
+\x02\xaa\x1a\xfa\xe3\xcf\x0f\x88\xc10\x0e5\xc0\x8d\x1b7\x18\x18\x18\x18\x18\
+\x98\xa8b\x1a\x16\xc0\x82M\x90\x03\x87bR\xfcD3\x17\x8f\x1aL{\x83\xb1\xa6\nj\
+\xa4\xe8\xa1\x17\x14\x04\r\xe6\xc0\x99](0\x18f(9\x86\xe34\x18\xdd0R\r\xa7o\
+\x18\xe3r\x1d)\xae\xa6w\x06\xa1<\x8b\x0c\xbd\x0c\x02\x0f\nX]EU\x83\xa9U\x91"\
+\x03\x00\x9c{\x16ip\xfa\xbe\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolListCtrlBitmap():
+    return wxBitmapFromImage(getToolListCtrlImage())
+
+def getToolListCtrlImage():
+    stream = cStringIO.StringIO(getToolListCtrlData())
+    return wxImageFromStream(stream)
+
+def getToolListCtrlIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolListCtrlBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolCheckListData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xcdIDATx\x9c\xdd\x951\x0e\xc3 \x0cE\x7f+\x0f\x1c\xb6C\x8e\x92\xa1\x07\
+\xcb\xd0\x81\xa30Dj\x87\x8a\x8a\x82\xbfqhX\xfa\xa5\x0c\xd8\xc1\xcf61\xb9\xac\
+\xf7\xf5\x89\x89\x12\x00Xn\xcb\x94\xe0iOo@^\x9c\xa9\x18#\x00\xe0Z;\x82\x04\
+\x04\t\xea&\xe6c\xef\xab\x00\x80W3R\xa5\n\x00\xda\xac\xac\xaa\xd2\x9e\xa8\
+\x9f\x02\xcaM9\xc8\x88(\xa0\x84\xb0\xe0\xa5\x8fU!\x8dE\t\xd0\x83X\xa2\x00-\
+\xbb\x12\xc2\xa0\xb5\xdd<\x03k\xed\x95\n\xb0\xbe\x98\x1e\xb0\xb67-\xb22\x1d\
+\xa9\xa2\x01\xe4,\xeb~3[\x0f\xee\x9ad\xab\x1d\xf99<hg\xc9\x9c\x83\x9e<\x87\
+\xfe\x13\xc03\x17\xd3[\xf4\xa7g\xa0\xdd;\xb5\xbcC\xf7\x01\xe4\x7f\xe8\xf6\
+\xd8\xbe\xd6\xcc\xe6\x95\x1c\xc9fD/\xb2\x10\x87\xc3dJ"U\x00\x00\x00\x00IEND\
+\xaeB`\x82' 
+
+def getToolCheckListBitmap():
+    return wxBitmapFromImage(getToolCheckListImage())
+
+def getToolCheckListImage():
+    stream = cStringIO.StringIO(getToolCheckListData())
+    return wxImageFromStream(stream)
+
+def getToolCheckListIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolCheckListBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolNotebookData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x18\x08\x06\
+\x00\x00\x00\xe0w=\xf8\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xd8IDATx\x9c\xed\x96!\x12\x830\x10E\x7f:\x11\xc8\x88\n\x8e\x80\xa8\xe0\
+\x08\x1c=\xa2"\x12Q\x91#D \x90\x88\xceP\x95N\x12\x92\xb0K\x87\x8aN\x9f\xdb\
+\xcdN\xfe\xfeea\x10J)\xb8\xc9\xad \xd0^[A\xa9\x0b\x91nr\xab\xb5\x96T<\xcf\
+\xf3\xaa\x94b\x89\xc8\\\xb2\xbf\xf5\x18\x1fc\x94\xd3Z\x03\xc0\xae\xdb\xd4eV\
+\xa0\x86\xb9\x9b\xeay\xear#\xe0\xbb\xcf\xb9\xf0\x0c\xc3\x10\xc5\xde\x9d1[q\
+\xb6\x83\xf4R/\x18\xc6!\x970\x08\xbb\xf6.>%;"\n\xe1\x98J\xddG\x02\xa5\x99\
+\x97\xf2\x87Ft\x06o\x81\xd2\xc6\x94\xf2T\x0eo\x11\xfb\x19p\xa8]\x98"\x96\xe7\
+B\xfe\x16\x01@\xd7u\xe4\xdaF6|\x07\x9cf\x80\x13\xb7\xc8\x8f\xf1{k\xfa\x17\
+\xf8]\x01\t\xf0\xdeL.\x02\x00\xe9\x97\xe5(/\x90\xf2\\\xdd\xe7\xbb{_\x00\x00\
+\x00\x00IEND\xaeB`\x82' 
+
+def getToolNotebookBitmap():
+    return wxBitmapFromImage(getToolNotebookImage())
+
+def getToolNotebookImage():
+    stream = cStringIO.StringIO(getToolNotebookData())
+    return wxImageFromStream(stream)
+
+def getToolNotebookIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolNotebookBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolSpinCtrlData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x0c$\xbf\x95\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\xebIDATx\x9c\xad\x94\xbd\x11\x84 \x10\x85\x1f7\x06\x86\x1b\x18P\x82\
+eX\x90\x01\x05\\p%\x18\x18X\x8eeP\x02\x81\xc1\x86\x04\xcep\xc1\x1d\xce\xc9\
+\x00\x87?o\x86dY\xdf\xe7\xee\x02b\x18\x07\x87\x13z=_\xa2(\xf1\x0b8\xb4\xecj\
+\x1d\x11!\\\xb1x\xe5Av\xb5E?\xa4\xb5\x8e\xc6\xcdb\x9c\xd6\x1a\xcc\xec\x88h\
+\xab\xeeQ\xe4\xfaG\xde\x1c\x00\x86q\x003omO\x02\xea\xaa>l\x0e\x00]\xd7\xed U\
+\xec\xa3Rs\xafy\x9e\x93{Q\x80]m\x11\xc4,\xc6\xe5\xf2\x98\xd9E\x01\xa5\x92\
+\x8d\x14D\x94\xcd\xb9e\xc89]\xaa\xc0,&yI\xa7i\x82\xea\xd55\x80l\xa4\x08O\x11\
+\xf0\x19\xba\xea\x15\x88H\\n\x91l\xa4h\xdbv\x17\xf3\xe6@f\x06\xa57;Txdo\x19\
+\xb2\xaf\xe2\xb75~o\x9bA\xea\x8d9\x02\t\xdf\xa1\rp\xb6\x1d\xa1Bs\x00x\x03\
+\xf8\x1fx\xe7\xcd\xa8y\xd6\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolSpinCtrlBitmap():
+    return wxBitmapFromImage(getToolSpinCtrlImage())
+
+def getToolSpinCtrlImage():
+    stream = cStringIO.StringIO(getToolSpinCtrlData())
+    return wxImageFromStream(stream)
+
+def getToolSpinCtrlIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolSpinCtrlBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolUnknownData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00dIDATx\x9ccd``\xf8\xcf@\x01`a```\xb8p\xe5\x02Y\x9a\rt\x0c \x06\xe0\
+\x92D\x06\xb8,a"F3.1\x9c\x06 \xdbJ\xc8{x\r \x06`\r\x03R\x02\x95\xa0\x0b`~\')\
+\x10\xd15S\xe4\x02|\xb6\x13m\x00>\x803!\x11\xb2\x99(\x17\x18\xe8\x18\x10\x0c\
+\x87\x81\xf7\x02#\x03\x85\xd9\x19\x00\x180\x1c\x9b3;\xb6\xda\x00\x00\x00\x00\
+IEND\xaeB`\x82' 
+
+def getToolUnknownBitmap():
+    return wxBitmapFromImage(getToolUnknownImage())
+
+def getToolUnknownImage():
+    stream = cStringIO.StringIO(getToolUnknownData())
+    return wxImageFromStream(stream)
+
+def getToolUnknownIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolUnknownBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolBoxSizerData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00DIDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4\x9b\x1a\x06\xb00000\x04\x84\
+\x04\xfc\xa7\xc8\x00\x06\x06\x06\x86\rk60bS\x10\x10\x12\xf0\x1f\x9f\xdc\xc0\
+\x87\xc1\xa8\x01T0\x80Q@@\x80\xa2\x84\xc48\xf43\x13\x00\xf5\xfe\x0c\x98\x979\
+f\xc6\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolBoxSizerBitmap():
+    return wxBitmapFromImage(getToolBoxSizerImage())
+
+def getToolBoxSizerImage():
+    stream = cStringIO.StringIO(getToolBoxSizerData())
+    return wxImageFromStream(stream)
+
+def getToolBoxSizerIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolBoxSizerBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolSeparatorData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x0e\x00\x00\x00\x02\x08\x06\
+\x00\x00\x00h\x8a\xed\xaa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00\x19IDATx\x9cc\x9c0e\xc2\x7f\x06\x12AFF\x06\x03\x0b\x8cA*\x00\x00\
+\xb5q\x05)B\x17\xc1\x07\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolSeparatorBitmap():
+    return wxBitmapFromImage(getToolSeparatorImage())
+
+def getToolSeparatorImage():
+    stream = cStringIO.StringIO(getToolSeparatorData())
+    return wxImageFromStream(stream)
+
+def getToolSeparatorIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolSeparatorBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolStaticBoxSizerData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00dIDATx\x9c\xed\x92A\n\xc00\x08\x045\xe4\x01\xfb4\x0f>3\x07\x9f\xe6\
+\x0f\xecU,\xb4IS\xe8\xa5s\x11\x16\x1c\x16\x91\x01\xd0\x0e\xad\x06\xee\x1e\
+\x8f\x05\xee\x1e\x00xE\xd2\x89\x88D%l\x18\xd7\x06\xa2r+\xea5\xc8\rl\x18gyET\
+\xa2\xd5\xe5<g8\x1dq\x95_\xf0\x82\x80\x01L=\xcc\xa5`\x87\xefop\x00N\x12$g%t;\
+\xe1\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolStaticBoxSizerBitmap():
+    return wxBitmapFromImage(getToolStaticBoxSizerImage())
+
+def getToolStaticBoxSizerImage():
+    stream = cStringIO.StringIO(getToolStaticBoxSizerData())
+    return wxImageFromStream(stream)
+
+def getToolStaticBoxSizerIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolStaticBoxSizerBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getToolGridSizerData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
+\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
+\x00\x00<IDATx\x9cc\x14\x10\x10`\x08\x08\t\xf8\xcf@&`\x8116\xac\xd9\xc0\x88M\
+A@H\xc0\x7f|rL\xe4\xda\x0c\x03\xa3\x06000\x8eF\xe3p0\x80\xe2hd\x14\x10\x10\
+\xa0\xc8\x05\x00M\x98\x16\xba|O\xcc\x02\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getToolGridSizerBitmap():
+    return wxBitmapFromImage(getToolGridSizerImage())
+
+def getToolGridSizerImage():
+    stream = cStringIO.StringIO(getToolGridSizerData())
+    return wxImageFromStream(stream)
+
+def getToolGridSizerIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getToolGridSizerBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getTreeSeparatorData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x0e\x08\x06\
+\x00\x00\x00&/\x9c\x8a\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x007IDATx\x9cc\x14\x10\x10`\xa0\x040Q\xa4{\xd4\x00\x06\x06\x06\x06\x06\x16\
+\x18\xa3\xa1\xa5\xe1?\xb1\x9a222\x18$D$\x18Q\x0c\x80I\x90\n\x18G\xd3\xc1 0\
+\x00\x00\xfb\xe8\x05\xb7\x9e\n\x8b\xdd\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeSeparatorBitmap():
+    return wxBitmapFromImage(getTreeSeparatorImage())
+
+def getTreeSeparatorImage():
+    stream = cStringIO.StringIO(getTreeSeparatorData())
+    return wxImageFromStream(stream)
+
+def getTreeSeparatorIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getTreeSeparatorBitmap())
+    return icon
+
diff --git a/wxPython/wxPython/tools/XRCed/panel.py b/wxPython/wxPython/tools/XRCed/panel.py
index 3753a96903..b9abd4b2bd 100644
--- a/wxPython/wxPython/tools/XRCed/panel.py
+++ b/wxPython/wxPython/tools/XRCed/panel.py
@@ -19,6 +19,10 @@ class Panel(wxNotebook):
         g.panel = panel = self
         self.modified = False
 
+        # Set common button size for parameter buttons
+        import params
+        params.buttonSize = self.DLG_SZE(buttonSize)
+
         # List of child windows
         self.pages = []
         # Create scrolled windows for pages
@@ -160,6 +164,7 @@ class ParamPage(wxPanel):
         self.checks = {}
         self.controls = {}              # save python objects
         self.controlName = None
+        
     def OnCheckParams(self, evt):
         xxx = self.xxx
         param = evt.GetEventObject().GetName()
@@ -249,11 +254,12 @@ class PropPage(ParamPage):
         box.SetFont(labelFont)
         topSizer = wxStaticBoxSizer(box, wxVERTICAL)
         sizer = wxFlexGridSizer(len(xxx.allParams), 2, 1, 1)
+        sizer.AddGrowableCol(1)
         if xxx.hasName:
             label = wxStaticText(self, -1, 'XML ID:', size=(100,-1))
-            control = ParamText(self, name='XML_name')
+            control = ParamText(self, 'XML_name', 200)
             sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 5) ])
+                            (control, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM | wxGROW, 5) ])
             self.controlName = control
         for param in xxx.allParams:
             present = xxx.params.has_key(param)
@@ -279,7 +285,7 @@ class PropPage(ParamPage):
             control = typeClass(self, param)
             control.Enable(present)
             sizer.AddMany([ (label, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL) ])
+                            (control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
             self.controls[param] = control
         topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
         self.SetAutoLayout(True)
@@ -321,6 +327,7 @@ class StylePage(ParamPage):
         box.SetFont(labelFont)
         topSizer = wxStaticBoxSizer(box, wxVERTICAL)
         sizer = wxFlexGridSizer(len(xxx.styles), 2, 1, 1)
+        sizer.AddGrowableCol(1)
         for param in xxx.styles:
             present = xxx.params.has_key(param)
             check = wxCheckBox(self, paramIDs[param],
@@ -329,7 +336,7 @@ class StylePage(ParamPage):
             control = paramDict[param](self, name = param)
             control.Enable(present)
             sizer.AddMany([ (check, 0, wxALIGN_CENTER_VERTICAL),
-                            (control, 0, wxALIGN_CENTER_VERTICAL) ])
+                            (control, 0, wxALIGN_CENTER_VERTICAL | wxGROW) ])
             self.checks[param] = check
             self.controls[param] = control
         topSizer.Add(sizer, 1, wxALL | wxEXPAND, 3)
diff --git a/wxPython/wxPython/tools/XRCed/params.py b/wxPython/wxPython/tools/XRCed/params.py
index b57e84193f..a0c71474cf 100644
--- a/wxPython/wxPython/tools/XRCed/params.py
+++ b/wxPython/wxPython/tools/XRCed/params.py
@@ -16,7 +16,7 @@ genericStyles = ['wxSIMPLE_BORDER', 'wxDOUBLE_BORDER',
                  'wxTRANSPARENT_WINDOW', 'wxWANTS_CHARS',
                  'wxNO_FULL_REPAINT_ON_RESIZE']
 
-buttonSize = (55,-1)
+buttonSize = (30,-1)    # in dialog units, transformed to pixels in panel ctor
 
 # Class that can properly disable children
 class PPanel(wxPanel):
@@ -351,14 +351,16 @@ class ParamUnit(PPanel):
         self.Change(-1)
 
 class ParamText(PPanel):
-    def __init__(self, parent, name, textWidth=260):
+    def __init__(self, parent, name, textWidth=-1):
         PPanel.__init__(self, parent, name)
         self.ID_TEXT_CTRL = wxNewId()
         # We use sizer even here to have the same size of text control
         sizer = wxBoxSizer()
         self.SetBackgroundColour(g.panel.GetBackgroundColour())
         self.text = wxTextCtrl(self, self.ID_TEXT_CTRL, size=wxSize(textWidth,-1))
-        sizer.Add(self.text, 0, wxALIGN_CENTER_VERTICAL)
+        if textWidth == -1: option = 1
+        else: option = 0
+        sizer.Add(self.text, option, wxALIGN_CENTER_VERTICAL)
         self.SetAutoLayout(True)
         self.SetSizer(sizer)
         sizer.Fit(self)
@@ -372,12 +374,20 @@ class ParamText(PPanel):
 
 class ParamAccel(ParamText):
     def __init__(self, parent, name):
-        ParamText.__init__(self, parent, name, 50)
+        ParamText.__init__(self, parent, name, 100)
 
 class ParamPosSize(ParamText):
     def __init__(self, parent, name):
         ParamText.__init__(self, parent, name, 80)
 
+class ParamLabel(ParamText):
+    def __init__(self, parent, name):
+        ParamText.__init__(self, parent, name, 200)
+
+class ParamEncoding(ParamText):
+    def __init__(self, parent, name):
+        ParamText.__init__(self, parent, name, 100)
+
 class ContentDialog(wxDialogPtr):
     def __init__(self, parent, value):
         # Load from resource
@@ -815,12 +825,13 @@ paramDict = {
     'pos': ParamPosSize, 'size': ParamPosSize,
     'border': ParamUnit, 'cols': ParamInt, 'rows': ParamInt,
     'vgap': ParamUnit, 'hgap': ParamUnit,
-    'checkable': ParamBool, 'accel': ParamAccel,
+    'checkable': ParamBool, 'checked': ParamBool, 'radio': ParamBool,
+    'accel': ParamAccel,
     'label': ParamText, 'title': ParamText, 'value': ParamText,
     'content': ParamContent, 'selection': ParamInt,
     'min': ParamInt, 'max': ParamInt,
     'fg': ParamColour, 'bg': ParamColour, 'font': ParamFont,
     'enabled': ParamBool, 'focused': ParamBool, 'hidden': ParamBool,
     'tooltip': ParamText, 'bitmap': ParamBitmap, 'icon': ParamBitmap,
+    'label': ParamLabel, 'encoding': ParamEncoding
     }
-
diff --git a/wxPython/wxPython/tools/XRCed/tree.py b/wxPython/wxPython/tools/XRCed/tree.py
index 90eb181683..4036f5d249 100644
--- a/wxPython/wxPython/tools/XRCed/tree.py
+++ b/wxPython/wxPython/tools/XRCed/tree.py
@@ -34,70 +34,202 @@ class MyDocument(minidom.Document):
 
 ################################################################################
 
+# Ids for menu commands
+class ID_NEW:
+    PANEL = wxNewId()
+    DIALOG = wxNewId()
+    FRAME = wxNewId()
+    TOOL_BAR = wxNewId()
+    TOOL = wxNewId()
+    MENU_BAR = wxNewId()
+    MENU = wxNewId()
+
+    STATIC_TEXT = wxNewId()
+    TEXT_CTRL = wxNewId()
+
+    BUTTON = wxNewId()
+    BITMAP_BUTTON = wxNewId()
+    RADIO_BUTTON = wxNewId()
+    SPIN_BUTTON = wxNewId()
+
+    STATIC_BOX = wxNewId()
+    CHECK_BOX = wxNewId()
+    RADIO_BOX = wxNewId()
+    COMBO_BOX = wxNewId()
+    LIST_BOX = wxNewId()
+
+    STATIC_LINE = wxNewId()
+    STATIC_BITMAP = wxNewId()
+    CHOICE = wxNewId()
+    SLIDER = wxNewId()
+    GAUGE = wxNewId()
+    SCROLL_BAR = wxNewId()
+    TREE_CTRL = wxNewId()
+    LIST_CTRL = wxNewId()
+    CHECK_LIST = wxNewId()
+    NOTEBOOK = wxNewId()
+    HTML_WINDOW = wxNewId()
+    CALENDAR_CTRL = wxNewId()
+    GENERIC_DIR_CTRL = wxNewId()
+    SPIN_CTRL = wxNewId()
+    UNKNOWN = wxNewId()
+
+    BOX_SIZER = wxNewId()
+    STATIC_BOX_SIZER = wxNewId()
+    GRID_SIZER = wxNewId()
+    FLEX_GRID_SIZER = wxNewId()
+    SPACER = wxNewId()
+    TOOL_BAR = wxNewId()
+    TOOL = wxNewId()
+    MENU = wxNewId()
+    MENU_ITEM = wxNewId()
+    SEPARATOR = wxNewId()
+    LAST = wxNewId()    
+
 class PullDownMenu:
-    ID_NEW_PANEL = wxNewId()
-    ID_NEW_DIALOG = wxNewId()
-    ID_NEW_FRAME = wxNewId()
-    ID_NEW_TOOL_BAR = wxNewId()
-    ID_NEW_TOOL = wxNewId()
-    ID_NEW_MENU_BAR = wxNewId()
-    ID_NEW_MENU = wxNewId()
-
-    ID_NEW_STATIC_TEXT = wxNewId()
-    ID_NEW_TEXT_CTRL = wxNewId()
-
-    ID_NEW_BUTTON = wxNewId()
-    ID_NEW_BITMAP_BUTTON = wxNewId()
-    ID_NEW_RADIO_BUTTON = wxNewId()
-    ID_NEW_SPIN_BUTTON = wxNewId()
-
-    ID_NEW_STATIC_BOX = wxNewId()
-    ID_NEW_CHECK_BOX = wxNewId()
-    ID_NEW_RADIO_BOX = wxNewId()
-    ID_NEW_COMBO_BOX = wxNewId()
-    ID_NEW_LIST_BOX = wxNewId()
-
-    ID_NEW_STATIC_LINE = wxNewId()
-    ID_NEW_STATIC_BITMAP = wxNewId()
-    ID_NEW_CHOICE = wxNewId()
-    ID_NEW_SLIDER = wxNewId()
-    ID_NEW_GAUGE = wxNewId()
-    ID_NEW_SCROLL_BAR = wxNewId()
-    ID_NEW_TREE_CTRL = wxNewId()
-    ID_NEW_LIST_CTRL = wxNewId()
-    ID_NEW_CHECK_LIST = wxNewId()
-    ID_NEW_NOTEBOOK = wxNewId()
-    ID_NEW_HTML_WINDOW = wxNewId()
-    ID_NEW_CALENDAR_CTRL = wxNewId()
-    ID_NEW_GENERIC_DIR_CTRL = wxNewId()
-    ID_NEW_SPIN_CTRL = wxNewId()
-    ID_NEW_UNKNOWN = wxNewId()
-
-    ID_NEW_BOX_SIZER = wxNewId()
-    ID_NEW_STATIC_BOX_SIZER = wxNewId()
-    ID_NEW_GRID_SIZER = wxNewId()
-    ID_NEW_FLEX_GRID_SIZER = wxNewId()
-    ID_NEW_SPACER = wxNewId()
-    ID_NEW_TOOL_BAR = wxNewId()
-    ID_NEW_TOOL = wxNewId()
-    ID_NEW_MENU = wxNewId()
-    ID_NEW_MENU_ITEM = wxNewId()
-    ID_NEW_SEPARATOR = wxNewId()
-    ID_NEW_LAST = wxNewId()
     ID_EXPAND = wxNewId()
     ID_COLLAPSE = wxNewId()
     ID_PASTE_SIBLING = wxNewId()
 
     def __init__(self, parent):
         self.ID_DELETE = parent.ID_DELETE
-        EVT_MENU_RANGE(parent, self.ID_NEW_PANEL,
-                       self.ID_NEW_LAST, parent.OnCreate)
+        EVT_MENU_RANGE(parent, ID_NEW.PANEL, ID_NEW.LAST, parent.OnCreate)
         EVT_MENU(parent, self.ID_COLLAPSE, parent.OnCollapse)
         EVT_MENU(parent, self.ID_EXPAND, parent.OnExpand)
         EVT_MENU(parent, self.ID_PASTE_SIBLING, parent.OnPaste)
         # We connect to tree, but process in frame
         EVT_MENU_HIGHLIGHT_ALL(g.tree, parent.OnPullDownHighlight)
 
+        # Mapping from IDs to element names
+        self.createMap = {
+            ID_NEW.PANEL: 'wxPanel',
+            ID_NEW.DIALOG: 'wxDialog',
+            ID_NEW.FRAME: 'wxFrame',
+            ID_NEW.TOOL_BAR: 'wxToolBar',
+            ID_NEW.TOOL: 'tool',
+            ID_NEW.MENU_BAR: 'wxMenuBar',
+            ID_NEW.MENU: 'wxMenu',
+            ID_NEW.MENU_ITEM: 'wxMenuItem',
+            ID_NEW.SEPARATOR: 'separator',
+
+            ID_NEW.STATIC_TEXT: 'wxStaticText',
+            ID_NEW.TEXT_CTRL: 'wxTextCtrl',
+
+            ID_NEW.BUTTON: 'wxButton',
+            ID_NEW.BITMAP_BUTTON: 'wxBitmapButton',
+            ID_NEW.RADIO_BUTTON: 'wxRadioButton',
+            ID_NEW.SPIN_BUTTON: 'wxSpinButton',
+
+            ID_NEW.STATIC_BOX: 'wxStaticBox',
+            ID_NEW.CHECK_BOX: 'wxCheckBox',
+            ID_NEW.RADIO_BOX: 'wxRadioBox',
+            ID_NEW.COMBO_BOX: 'wxComboBox',
+            ID_NEW.LIST_BOX: 'wxListBox',
+
+            ID_NEW.STATIC_LINE: 'wxStaticLine',
+            ID_NEW.STATIC_BITMAP: 'wxStaticBitmap',
+            ID_NEW.CHOICE: 'wxChoice',
+            ID_NEW.SLIDER: 'wxSlider',
+            ID_NEW.GAUGE: 'wxGauge',
+            ID_NEW.SCROLL_BAR: 'wxScrollBar',
+            ID_NEW.TREE_CTRL: 'wxTreeCtrl',
+            ID_NEW.LIST_CTRL: 'wxListCtrl',
+            ID_NEW.CHECK_LIST: 'wxCheckList',
+            ID_NEW.NOTEBOOK: 'wxNotebook',
+            ID_NEW.HTML_WINDOW: 'wxHtmlWindow',
+            ID_NEW.CALENDAR_CTRL: 'wxCalendarCtrl',
+            ID_NEW.GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
+            ID_NEW.SPIN_CTRL: 'wxSpinCtrl',
+
+            ID_NEW.BOX_SIZER: 'wxBoxSizer',
+            ID_NEW.STATIC_BOX_SIZER: 'wxStaticBoxSizer',
+            ID_NEW.GRID_SIZER: 'wxGridSizer',
+            ID_NEW.FLEX_GRID_SIZER: 'wxFlexGridSizer',
+            ID_NEW.SPACER: 'spacer',
+            ID_NEW.UNKNOWN: 'unknown',
+            }
+        self.controls = [
+            ['control', 'Various controls',
+             (ID_NEW.STATIC_TEXT, 'Label', 'Create label'),
+             (ID_NEW.STATIC_BITMAP, 'Bitmap', 'Create bitmap'),
+             (ID_NEW.STATIC_LINE, 'Line', 'Create line'),
+             (ID_NEW.TEXT_CTRL, 'TextBox', 'Create text box'),
+             (ID_NEW.CHOICE, 'Choice', 'Create choice'),
+             (ID_NEW.SLIDER, 'Slider', 'Create slider'),
+             (ID_NEW.GAUGE, 'Gauge', 'Create gauge'),
+             (ID_NEW.SPIN_CTRL, 'SpinCtrl', 'Create spin'),
+             (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
+             (ID_NEW.TREE_CTRL, 'TreeCtrl', 'Create tree'),
+             (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list'),
+             (ID_NEW.CHECK_LIST, 'CheckList', 'Create check list'),
+             (ID_NEW.HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
+             (ID_NEW.CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),
+             (ID_NEW.GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
+             (ID_NEW.UNKNOWN, 'Unknown', 'Create custom control placeholder'),
+             ],
+            ['button', 'Buttons',
+             (ID_NEW.BUTTON, 'Button', 'Create button'),
+             (ID_NEW.BITMAP_BUTTON, 'BitmapButton', 'Create bitmap button'),
+             (ID_NEW.RADIO_BUTTON, 'RadioButton', 'Create radio button'),
+             (ID_NEW.SPIN_BUTTON, 'SpinButton', 'Create spin button'),
+             ],
+            ['box', 'Boxes',
+             (ID_NEW.STATIC_BOX, 'StaticBox', 'Create static box'),
+             (ID_NEW.CHECK_BOX, 'CheckBox', 'Create check box'),
+             (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
+             (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
+             (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),
+             ],
+            ['container', 'Containers',
+             (ID_NEW.PANEL, 'Panel', 'Create panel'),
+             (ID_NEW.NOTEBOOK, 'Notebook', 'Create notebook control'),
+             (ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar'),
+             ],
+            ['sizer', 'Sizers',
+             (ID_NEW.BOX_SIZER, 'BoxSizer', 'Create box sizer'),
+             (ID_NEW.STATIC_BOX_SIZER, 'StaticBoxSizer',
+              'Create static box sizer'),
+             (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'),
+             (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer',
+              'Create flexgrid sizer'),
+             (ID_NEW.SPACER, 'Spacer', 'Create spacer'),
+             ]
+            ]
+        self.menuControls = [
+            (ID_NEW.MENU, 'Menu', 'Create menu'),
+            (ID_NEW.MENU_ITEM, 'MenuItem', 'Create menu item'),
+            (ID_NEW.SEPARATOR, 'Separator', 'Create separator'),
+            ]
+        self.toolBarControls = [
+            (ID_NEW.TOOL, 'Tool', 'Create tool'),
+            (ID_NEW.SEPARATOR, 'Separator', 'Create separator'),
+            ['control', 'Various controls',
+             (ID_NEW.STATIC_TEXT, 'Label', 'Create label'),
+             (ID_NEW.STATIC_BITMAP, 'Bitmap', 'Create bitmap'),
+             (ID_NEW.STATIC_LINE, 'Line', 'Create line'),
+             (ID_NEW.TEXT_CTRL, 'TextBox', 'Create text box'),
+             (ID_NEW.CHOICE, 'Choice', 'Create choice'),
+             (ID_NEW.SLIDER, 'Slider', 'Create slider'),
+             (ID_NEW.GAUGE, 'Gauge', 'Create gauge'),
+             (ID_NEW.SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
+             (ID_NEW.LIST_CTRL, 'ListCtrl', 'Create list control'),
+             (ID_NEW.CHECK_LIST, 'CheckList', 'Create check list'),
+             ],
+            ['button', 'Buttons',
+             (ID_NEW.BUTTON, 'Button', 'Create button'),
+             (ID_NEW.BITMAP_BUTTON, 'BitmapButton', 'Create bitmap button'),
+             (ID_NEW.RADIO_BUTTON, 'RadioButton', 'Create radio button'),
+             (ID_NEW.SPIN_BUTTON, 'SpinButton', 'Create spin button'),
+             ],
+            ['box', 'Boxes',
+             (ID_NEW.STATIC_BOX, 'StaticBox', 'Create static box'),
+             (ID_NEW.CHECK_BOX, 'CheckBox', 'Create check box'),
+             (ID_NEW.RADIO_BOX, 'RadioBox', 'Create radio box'),
+             (ID_NEW.COMBO_BOX, 'ComboBox', 'Create combo box'),
+             (ID_NEW.LIST_BOX, 'ListBox', 'Create list box'),
+             ],
+            ]
+
 ################################################################################
 
 # Set menu to list items.
@@ -172,8 +304,11 @@ class XML_Tree(wxTreeCtrl):
         xxxDialog.image = il.AddIcon(images.getTreeDialogIcon())
         xxxFrame.image = il.AddIcon(images.getTreeFrameIcon())
         xxxMenuBar.image = il.AddIcon(images.getTreeMenuBarIcon())
-        xxxToolBar.image = il.AddIcon(images.getTreeToolBarIcon())
         xxxMenu.image = il.AddIcon(images.getTreeMenuIcon())
+        xxxMenuItem.image = il.AddIcon(images.getTreeMenuItemIcon())
+        xxxToolBar.image = il.AddIcon(images.getTreeToolBarIcon())
+        xxxTool.image = il.AddIcon(images.getTreeToolIcon())
+        xxxSeparator.image = il.AddIcon(images.getTreeSeparatorIcon())
         xxxSizer.imageH = il.AddIcon(images.getTreeSizerHIcon())
         xxxSizer.imageV = il.AddIcon(images.getTreeSizerVIcon())
         xxxStaticBoxSizer.imageH = il.AddIcon(images.getTreeStaticBoxSizerHIcon())
@@ -183,9 +318,16 @@ class XML_Tree(wxTreeCtrl):
         self.il = il
         self.SetImageList(il)
 
+    def RegisterKeyEvents(self):
+        EVT_KEY_DOWN(self, g.tools.OnKeyDown)
+        EVT_KEY_UP(self, g.tools.OnKeyUp)
+        EVT_ENTER_WINDOW(self, g.tools.OnMouse)
+        EVT_LEAVE_WINDOW(self, g.tools.OnMouse)
+
     def Unselect(self):
         self.selection = None
         wxTreeCtrl.Unselect(self)
+        g.tools.UpdateUI()
 
     def ExpandAll(self, item):
         if self.ItemHasChildren(item):
@@ -377,6 +519,8 @@ class XML_Tree(wxTreeCtrl):
         xxx = self.GetPyData(self.selection)
         # Update panel
         g.panel.SetData(xxx)
+        # Update tools
+        g.tools.UpdateUI()
         # Hightlighting is done in OnIdle
         self.pendingHighLight = self.selection
     # Check if item is in testWin subtree
@@ -437,6 +581,7 @@ class XML_Tree(wxTreeCtrl):
     def CreateTestWin(self, item):
         testWin = g.testWin
         wxBeginBusyCursor()
+        wxYield()
         # Create a window with this resource
         xxx = self.GetPyData(item).treeObject()
         # Close old window, remember where it was
@@ -611,27 +756,27 @@ class XML_Tree(wxTreeCtrl):
             menu.Append(g.pullDownMenu.ID_EXPAND, 'Expand', 'Expand tree')
             menu.Append(g.pullDownMenu.ID_COLLAPSE, 'Collapse', 'Collapse tree')
         else:
-            self.ctrl = evt.ControlDown() # save Ctrl state
-            self.shift = evt.ShiftDown()  # and Shift too
+#            self.ctrl = evt.ControlDown() # save Ctrl state
+#            self.shift = evt.ShiftDown()  # and Shift too
             m = wxMenu()                  # create menu
             if self.ctrl:
                 needInsert = True
             else:
                 needInsert = self.NeedInsert(item)
             if item == self.root or needInsert and self.GetItemParent(item) == self.root:
-                m.Append(pullDownMenu.ID_NEW_PANEL, 'Panel', 'Create panel')
-                m.Append(pullDownMenu.ID_NEW_DIALOG, 'Dialog', 'Create dialog')
-                m.Append(pullDownMenu.ID_NEW_FRAME, 'Frame', 'Create frame')
+                m.Append(ID_NEW.PANEL, 'Panel', 'Create panel')
+                m.Append(ID_NEW.DIALOG, 'Dialog', 'Create dialog')
+                m.Append(ID_NEW.FRAME, 'Frame', 'Create frame')
                 m.AppendSeparator()
-                m.Append(pullDownMenu.ID_NEW_TOOL_BAR, 'ToolBar', 'Create toolbar')
-                m.Append(pullDownMenu.ID_NEW_MENU_BAR, 'MenuBar', 'Create menubar')
-                m.Append(pullDownMenu.ID_NEW_MENU, 'Menu', 'Create menu')
+                m.Append(ID_NEW.TOOL_BAR, 'ToolBar', 'Create toolbar')
+                m.Append(ID_NEW.MENU_BAR, 'MenuBar', 'Create menubar')
+                m.Append(ID_NEW.MENU, 'Menu', 'Create menu')
             else:
                 xxx = self.GetPyData(item).treeObject()
                 # Check parent for possible child nodes if inserting sibling
                 if needInsert: xxx = xxx.parent
                 if xxx.__class__ == xxxMenuBar:
-                    m.Append(pullDownMenu.ID_NEW_MENU, 'Menu', 'Create menu')
+                    m.Append(ID_NEW.MENU, 'Menu', 'Create menu')
                 elif xxx.__class__ in [xxxToolBar, xxxTool] or \
                      xxx.__class__ == xxxSeparator and xxx.parent.__class__ == xxxToolBar:
                     SetMenu(m, pullDownMenu.toolBarControls)
@@ -642,7 +787,7 @@ class XML_Tree(wxTreeCtrl):
                     if xxx.__class__ == xxxNotebook:
                         m.Enable(m.FindItem('sizer'), False)
                     elif not (xxx.isSizer or xxx.parent and xxx.parent.isSizer):
-                        m.Enable(pullDownMenu.ID_NEW_SPACER, False)
+                        m.Enable(ID_NEW.SPACER, False)
             # Select correct label for create menu
             if not needInsert:
                 if self.shift:
@@ -683,6 +828,9 @@ class XML_Tree(wxTreeCtrl):
         xxx = xxx.treeObject()
         if xxx.hasName and self.GetItemText(item) != xxx.name:
             self.SetItemText(item, xxx.treeName())
+            # Item width may have changed
+            # !!! Tric to update tree width (wxGTK, ??)
+            self.SetIndent(self.GetIndent())
         # Change tree icon for sizers
         if isinstance(xxx, xxxBoxSizer):
             self.SetItemImage(item, xxx.treeImage())
diff --git a/wxPython/wxPython/tools/XRCed/xrced.py b/wxPython/wxPython/tools/XRCed/xrced.py
index 703c1d768c..c28c5e89dd 100644
--- a/wxPython/wxPython/tools/XRCed/xrced.py
+++ b/wxPython/wxPython/tools/XRCed/xrced.py
@@ -29,6 +29,7 @@ import os, sys, getopt, re, traceback
 # Local modules
 from tree import *                      # imports xxx which imports params
 from panel import *
+from tools import *
 # Cleanup recursive import sideeffects, otherwise we can't create undoMan
 import undo
 undo.ParamPage = ParamPage
@@ -82,7 +83,8 @@ class Frame(wxFrame):
         wxFrame.__init__(self, None, -1, '', pos, size)
         global frame
         frame = g.frame = self
-        self.CreateStatusBar()
+        bar = self.CreateStatusBar(2)
+        bar.SetStatusWidths([-1, 40])
         self.SetIcon(images.getIconIcon())
 
         # Idle flag
@@ -119,6 +121,9 @@ class Frame(wxFrame):
         menu.Append(self.ID_EMBED_PANEL, '&Embed Panel',
                     'Toggle embedding properties panel in the main window', True)
         menu.Check(self.ID_EMBED_PANEL, conf.embedPanel)
+        self.ID_SHOW_TOOLS = wxNewId()
+        menu.Append(self.ID_SHOW_TOOLS, 'Show &Tools', 'Toggle tools', True)
+        menu.Check(self.ID_SHOW_TOOLS, conf.showTools)
         menu.AppendSeparator()
         self.ID_TEST = wxNewId()
         menu.Append(self.ID_TEST, '&Test\tF5', 'Test window')
@@ -185,6 +190,7 @@ class Frame(wxFrame):
         EVT_MENU(self, ID_SELECT, self.OnSelect)
         # View
         EVT_MENU(self, self.ID_EMBED_PANEL, self.OnEmbedPanel)
+        EVT_MENU(self, self.ID_SHOW_TOOLS, self.OnShowTools)
         EVT_MENU(self, self.ID_TEST, self.OnTest)
         EVT_MENU(self, self.ID_REFRESH, self.OnRefresh)
         EVT_MENU(self, self.ID_AUTO_REFRESH, self.OnAutoRefresh)
@@ -205,6 +211,8 @@ class Frame(wxFrame):
         # Build interface
         sizer = wxBoxSizer(wxVERTICAL)
         sizer.Add(wxStaticLine(self, -1), 0, wxEXPAND)
+        # Horizontal sizer for toolbar and splitter
+        self.toolsSizer = sizer1 = wxBoxSizer()
         splitter = wxSplitterWindow(self, -1, style=wxSP_3DSASH)
         self.splitter = splitter
         splitter.SetMinimumPaneSize(100)
@@ -212,6 +220,17 @@ class Frame(wxFrame):
         global tree
         g.tree = tree = XML_Tree(splitter, -1)
 
+        # Init pull-down menu data
+        global pullDownMenu
+        g.pullDownMenu = pullDownMenu = PullDownMenu(self)
+
+        # Vertical toolbar for GUI buttons
+        g.tools = tools = Tools(self)
+        tools.Show(conf.showTools)
+        if conf.showTools: sizer1.Add(tools, 0, wxEXPAND)
+
+        tree.RegisterKeyEvents()
+
         # !!! frame styles are broken
         # Miniframe for not embedded mode
         miniFrame = wxFrame(self, -1, 'Properties Panel',
@@ -233,142 +252,11 @@ class Frame(wxFrame):
             sizer2.Add(panel, 1, wxEXPAND)
             miniFrame.Show(True)
             splitter.Initialize(tree)
-        sizer.Add(splitter, 1, wxEXPAND)
+        sizer1.Add(splitter, 1, wxEXPAND)
+        sizer.Add(sizer1, 1, wxEXPAND)
         self.SetAutoLayout(True)
         self.SetSizer(sizer)
 
-        # Init pull-down menu data
-        global pullDownMenu
-        pullDownMenu = g.pullDownMenu = PullDownMenu(self)
-        # Mapping from IDs to element names
-        self.createMap = {
-            pullDownMenu.ID_NEW_PANEL: 'wxPanel',
-            pullDownMenu.ID_NEW_DIALOG: 'wxDialog',
-            pullDownMenu.ID_NEW_FRAME: 'wxFrame',
-            pullDownMenu.ID_NEW_TOOL_BAR: 'wxToolBar',
-            pullDownMenu.ID_NEW_TOOL: 'tool',
-            pullDownMenu.ID_NEW_MENU_BAR: 'wxMenuBar',
-            pullDownMenu.ID_NEW_MENU: 'wxMenu',
-            pullDownMenu.ID_NEW_MENU_ITEM: 'wxMenuItem',
-            pullDownMenu.ID_NEW_SEPARATOR: 'separator',
-
-            pullDownMenu.ID_NEW_STATIC_TEXT: 'wxStaticText',
-            pullDownMenu.ID_NEW_TEXT_CTRL: 'wxTextCtrl',
-
-            pullDownMenu.ID_NEW_BUTTON: 'wxButton',
-            pullDownMenu.ID_NEW_BITMAP_BUTTON: 'wxBitmapButton',
-            pullDownMenu.ID_NEW_RADIO_BUTTON: 'wxRadioButton',
-            pullDownMenu.ID_NEW_SPIN_BUTTON: 'wxSpinButton',
-
-            pullDownMenu.ID_NEW_STATIC_BOX: 'wxStaticBox',
-            pullDownMenu.ID_NEW_CHECK_BOX: 'wxCheckBox',
-            pullDownMenu.ID_NEW_RADIO_BOX: 'wxRadioBox',
-            pullDownMenu.ID_NEW_COMBO_BOX: 'wxComboBox',
-            pullDownMenu.ID_NEW_LIST_BOX: 'wxListBox',
-
-            pullDownMenu.ID_NEW_STATIC_LINE: 'wxStaticLine',
-            pullDownMenu.ID_NEW_STATIC_BITMAP: 'wxStaticBitmap',
-            pullDownMenu.ID_NEW_CHOICE: 'wxChoice',
-            pullDownMenu.ID_NEW_SLIDER: 'wxSlider',
-            pullDownMenu.ID_NEW_GAUGE: 'wxGauge',
-            pullDownMenu.ID_NEW_SCROLL_BAR: 'wxScrollBar',
-            pullDownMenu.ID_NEW_TREE_CTRL: 'wxTreeCtrl',
-            pullDownMenu.ID_NEW_LIST_CTRL: 'wxListCtrl',
-            pullDownMenu.ID_NEW_CHECK_LIST: 'wxCheckList',
-            pullDownMenu.ID_NEW_NOTEBOOK: 'wxNotebook',
-            pullDownMenu.ID_NEW_HTML_WINDOW: 'wxHtmlWindow',
-            pullDownMenu.ID_NEW_CALENDAR_CTRL: 'wxCalendarCtrl',
-            pullDownMenu.ID_NEW_GENERIC_DIR_CTRL: 'wxGenericDirCtrl',
-            pullDownMenu.ID_NEW_SPIN_CTRL: 'wxSpinCtrl',
-
-            pullDownMenu.ID_NEW_BOX_SIZER: 'wxBoxSizer',
-            pullDownMenu.ID_NEW_STATIC_BOX_SIZER: 'wxStaticBoxSizer',
-            pullDownMenu.ID_NEW_GRID_SIZER: 'wxGridSizer',
-            pullDownMenu.ID_NEW_FLEX_GRID_SIZER: 'wxFlexGridSizer',
-            pullDownMenu.ID_NEW_SPACER: 'spacer',
-            pullDownMenu.ID_NEW_UNKNOWN: 'unknown',
-            }
-        pullDownMenu.controls = [
-            ['control', 'Various controls',
-             (pullDownMenu.ID_NEW_STATIC_TEXT, 'Label', 'Create static label'),
-             (pullDownMenu.ID_NEW_STATIC_LINE, 'Line', 'Create static line'),
-             (pullDownMenu.ID_NEW_TEXT_CTRL, 'TextBox', 'Create text box control'),
-             (pullDownMenu.ID_NEW_CHOICE, 'Choice', 'Create choice control'),
-             (pullDownMenu.ID_NEW_SLIDER, 'Slider', 'Create slider control'),
-             (pullDownMenu.ID_NEW_GAUGE, 'Gauge', 'Create gauge control'),
-             (pullDownMenu.ID_NEW_SPIN_CTRL, 'SpinCtrl', 'Create spin control'),
-             (pullDownMenu.ID_NEW_SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
-             (pullDownMenu.ID_NEW_TREE_CTRL, 'TreeCtrl', 'Create tree control'),
-             (pullDownMenu.ID_NEW_LIST_CTRL, 'ListCtrl', 'Create list control'),
-             (pullDownMenu.ID_NEW_HTML_WINDOW, 'HtmlWindow', 'Create HTML window'),
-             (pullDownMenu.ID_NEW_CALENDAR_CTRL, 'CalendarCtrl', 'Create calendar control'),
-             (pullDownMenu.ID_NEW_GENERIC_DIR_CTRL, 'GenericDirCtrl', 'Create generic dir control'),
-             (pullDownMenu.ID_NEW_UNKNOWN, 'Unknown', 'Create custom control placeholder'),
-             ],
-            ['button', 'Buttons',
-             (pullDownMenu.ID_NEW_BUTTON, 'Button', 'Create button'),
-             (pullDownMenu.ID_NEW_BITMAP_BUTTON, 'BitmapButton', 'Create bitmap button'),
-             (pullDownMenu.ID_NEW_RADIO_BUTTON, 'RadioButton', 'Create radio button'),
-             (pullDownMenu.ID_NEW_SPIN_BUTTON, 'SpinButton', 'Create spin button'),
-             ],
-            ['box', 'Boxes',
-             (pullDownMenu.ID_NEW_STATIC_BOX, 'StaticBox', 'Create static box'),
-             (pullDownMenu.ID_NEW_CHECK_BOX, 'CheckBox', 'Create check box'),
-             (pullDownMenu.ID_NEW_RADIO_BOX, 'RadioBox', 'Create radio box'),
-             (pullDownMenu.ID_NEW_COMBO_BOX, 'ComboBox', 'Create combo box'),
-             (pullDownMenu.ID_NEW_LIST_BOX, 'ListBox', 'Create list box'),
-             (pullDownMenu.ID_NEW_CHECK_LIST, 'CheckListBox', 'Create check list control'),
-             ],
-            ['container', 'Containers',
-             (pullDownMenu.ID_NEW_PANEL, 'Panel', 'Create panel'),
-             (pullDownMenu.ID_NEW_NOTEBOOK, 'Notebook', 'Create notebook control'),
-             (pullDownMenu.ID_NEW_TOOL_BAR, 'ToolBar', 'Create toolbar'),
-             ],
-            ['sizer', 'Sizers',
-             (pullDownMenu.ID_NEW_BOX_SIZER, 'BoxSizer', 'Create box sizer'),
-             (pullDownMenu.ID_NEW_STATIC_BOX_SIZER, 'StaticBoxSizer',
-              'Create static box sizer'),
-             (pullDownMenu.ID_NEW_GRID_SIZER, 'GridSizer', 'Create grid sizer'),
-             (pullDownMenu.ID_NEW_FLEX_GRID_SIZER, 'FlexGridSizer',
-              'Create flexgrid sizer'),
-             (pullDownMenu.ID_NEW_SPACER, 'Spacer', 'Create spacer'),
-             ]
-            ]
-        pullDownMenu.menuControls = [
-            (pullDownMenu.ID_NEW_MENU, 'Menu', 'Create menu'),
-            (pullDownMenu.ID_NEW_MENU_ITEM, 'MenuItem', 'Create menu item'),
-            (pullDownMenu.ID_NEW_SEPARATOR, 'Separator', 'Create separator'),
-            ]
-        pullDownMenu.toolBarControls = [
-            (pullDownMenu.ID_NEW_TOOL, 'Tool', 'Create tool'),
-            (pullDownMenu.ID_NEW_SEPARATOR, 'Separator', 'Create separator'),
-            ['control', 'Various controls',
-             (pullDownMenu.ID_NEW_STATIC_TEXT, 'Label', 'Create static label'),
-             (pullDownMenu.ID_NEW_STATIC_LINE, 'Line', 'Create static line'),
-             (pullDownMenu.ID_NEW_TEXT_CTRL, 'TextBox', 'Create text box control'),
-             (pullDownMenu.ID_NEW_CHOICE, 'Choice', 'Create choice control'),
-             (pullDownMenu.ID_NEW_SLIDER, 'Slider', 'Create slider control'),
-             (pullDownMenu.ID_NEW_GAUGE, 'Gauge', 'Create gauge control'),
-             (pullDownMenu.ID_NEW_SCROLL_BAR, 'ScrollBar', 'Create scroll bar'),
-             (pullDownMenu.ID_NEW_LIST_CTRL, 'ListCtrl', 'Create list control'),
-             ],
-            ['button', 'Buttons',
-             (pullDownMenu.ID_NEW_BUTTON, 'Button', 'Create button'),
-             (pullDownMenu.ID_NEW_BITMAP_BUTTON, 'BitmapButton', 'Create bitmap button'),
-             (pullDownMenu.ID_NEW_RADIO_BUTTON, 'RadioButton', 'Create radio button'),
-             (pullDownMenu.ID_NEW_SPIN_BUTTON, 'SpinButton', 'Create spin button'),
-             ],
-            ['box', 'Boxes',
-             (pullDownMenu.ID_NEW_STATIC_BOX, 'StaticBox', 'Create static box'),
-             (pullDownMenu.ID_NEW_CHECK_BOX, 'CheckBox', 'Create check box'),
-             (pullDownMenu.ID_NEW_RADIO_BOX, 'RadioBox', 'Create radio box'),
-             (pullDownMenu.ID_NEW_COMBO_BOX, 'ComboBox', 'Create combo box'),
-             (pullDownMenu.ID_NEW_LIST_BOX, 'ListBox', 'Create list box'),
-             (pullDownMenu.ID_NEW_CHECK_LIST, 'CheckListBox',
-              'Create check list control'),
-             ],
-            ]
-
         # Initialize
         self.clipboard = None
         self.Clear()
@@ -377,6 +265,8 @@ class Frame(wxFrame):
         EVT_IDLE(self, self.OnIdle)
         EVT_CLOSE(self, self.OnCloseWindow)
         EVT_LEFT_DOWN(self, self.OnLeftDown)
+        EVT_KEY_DOWN(self, tools.OnKeyDown)
+        EVT_KEY_UP(self, tools.OnKeyUp)
 
     def OnNew(self, evt):
         self.Clear()
@@ -626,6 +516,15 @@ class Frame(wxFrame):
             self.SetDimensions(pos.x, pos.y,
                                max(size.x - sizePanel.x, self.minWidth), size.y)
 
+    def OnShowTools(self, evt):
+        conf.showTools = evt.IsChecked()
+        g.tools.Show(conf.showTools)
+        if conf.showTools:
+            self.toolsSizer.Prepend(g.tools, 0, wxEXPAND)
+        else:
+            self.toolsSizer.Remove(g.tools)
+        self.toolsSizer.Layout()
+        
     def OnTest(self, evt):
         if not tree.selection: return   # key pressed event
         tree.ShowTestWindow(tree.selection)
@@ -640,6 +539,7 @@ class Frame(wxFrame):
         if g.testWin:
             # (re)create
             tree.CreateTestWin(g.testWin.item)
+        panel.modified = False
         tree.needUpdate = False
 
     def OnAutoRefresh(self, evt):
@@ -707,7 +607,7 @@ Homepage: http://xrced.sourceforge.net\
         if parent.hasChild: parent = parent.child
 
         # Create element
-        className = self.createMap[evt.GetId()]
+        className = pullDownMenu.createMap[evt.GetId()]
         xxx = MakeEmptyXXX(parent, className)
 
         # Set default name for top-level windows
@@ -733,6 +633,7 @@ Homepage: http://xrced.sourceforge.net\
                 tree.pendingHighLight = newItem
             else:
                 tree.pendingHighLight = None
+        tree.SetFocus()
 
     # Expand/collapse subtree
     def OnExpand(self, evt):
@@ -948,6 +849,7 @@ class App(wxApp):
         pos = conf.ReadInt('x', -1), conf.ReadInt('y', -1)
         size = conf.ReadInt('width', 800), conf.ReadInt('height', 600)
         conf.embedPanel = conf.ReadInt('embedPanel', True)
+        conf.showTools = conf.ReadInt('showTools', True)
         conf.sashPos = conf.ReadInt('sashPos', 200)
         if not conf.embedPanel:
             conf.panelX = conf.ReadInt('panelX', -1)
@@ -984,6 +886,7 @@ class App(wxApp):
         wc.WriteInt('width', conf.width)
         wc.WriteInt('height', conf.height)
         wc.WriteInt('embedPanel', conf.embedPanel)
+        wc.WriteInt('showTools', conf.showTools)
         if not conf.embedPanel:
             wc.WriteInt('panelX', conf.panelX)
             wc.WriteInt('panelY', conf.panelY)
diff --git a/wxPython/wxPython/tools/XRCed/xrced.xrc b/wxPython/wxPython/tools/XRCed/xrced.xrc
index dd19218ab9..851cd6c03a 100644
--- a/wxPython/wxPython/tools/XRCed/xrced.xrc
+++ b/wxPython/wxPython/tools/XRCed/xrced.xrc
@@ -23,13 +23,14 @@
                 <object class="wxButton" name="BUTTON_UP">
                   <label>Move Up</label>
                 </object>
-                <flag>wxBOTTOM</flag>
+                <flag>wxBOTTOM|wxEXPAND</flag>
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_DOWN">
                   <label>Move Down</label>
                 </object>
+                <flag>wxEXPAND</flag>
               </object>
               <object class="spacer">
                 <size>10,20</size>
@@ -39,13 +40,14 @@
                 <object class="wxButton" name="BUTTON_APPEND">
                   <label>Append...</label>
                 </object>
-                <flag>wxBOTTOM</flag>
+                <flag>wxBOTTOM|wxEXPAND</flag>
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_REMOVE">
                   <label>Remove</label>
                 </object>
+                <flag>wxEXPAND</flag>
               </object>
             </object>
             <flag>wxALL|wxEXPAND</flag>
@@ -105,13 +107,14 @@
                 <object class="wxButton" name="BUTTON_UP">
                   <label>Move Up</label>
                 </object>
-                <flag>wxBOTTOM</flag>
+                <flag>wxBOTTOM|wxEXPAND</flag>
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_DOWN">
                   <label>Move Down</label>
                 </object>
+                <flag>wxEXPAND</flag>
               </object>
               <object class="spacer">
                 <size>10,20</size>
@@ -121,13 +124,14 @@
                 <object class="wxButton" name="BUTTON_APPEND">
                   <label>Append...</label>
                 </object>
-                <flag>wxBOTTOM</flag>
+                <flag>wxBOTTOM|wxEXPAND</flag>
                 <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_REMOVE">
                   <label>Remove</label>
                 </object>
+                <flag>wxEXPAND</flag>
               </object>
             </object>
             <flag>wxALL|wxEXPAND</flag>
@@ -251,34 +255,34 @@
                 <item>wxART_ADD_BOOKMARK</item>
                 <item>wxART_DEL_BOOKMARK</item>
                 <item>wxART_HELP_SIDE_PANEL</item>
-		<item>wxART_HELP_SETTINGS</item>
-		<item>wxART_HELP_BOOK</item>
-		<item>wxART_HELP_FOLDER</item>
-		<item>wxART_HELP_PAGE</item>
-		<item>wxART_GO_BACK</item>
-		<item>wxART_GO_FORWARD</item>
-		<item>wxART_GO_UP</item>
-		<item>wxART_GO_DOWN</item>
-		<item>wxART_GO_TO_PARENT</item>
-		<item>wxART_GO_HOME</item>
-		<item>wxART_FILE_OPEN</item>
-		<item>wxART_PRINT</item>
-		<item>wxART_HELP</item>
-		<item>wxART_TIP</item>
-		<item>wxART_REPORT_VIEW</item>
-		<item>wxART_LIST_VIEW</item>
-		<item>wxART_NEW_DIR</item>
-		<item>wxART_FOLDER</item>
-		<item>wxART_GO_DIR_UP</item>
-		<item>wxART_EXECUTABLE_FILE</item>
-		<item>wxART_NORMAL_FILE</item>
-		<item>wxART_TICK_MARK</item>
-		<item>wxART_CROSS_MARK</item>
-		<item>wxART_ERROR</item>
-		<item>wxART_QUESTION</item>
-		<item>wxART_WARNING</item>
-		<item>wxART_INFORMATION</item>
-		<item>wxART_MISSING_IMAGE</item>
+                <item>wxART_HELP_SETTINGS</item>
+                <item>wxART_HELP_BOOK</item>
+                <item>wxART_HELP_FOLDER</item>
+                <item>wxART_HELP_PAGE</item>
+                <item>wxART_GO_BACK</item>
+                <item>wxART_GO_FORWARD</item>
+                <item>wxART_GO_UP</item>
+                <item>wxART_GO_DOWN</item>
+                <item>wxART_GO_TO_PARENT</item>
+                <item>wxART_GO_HOME</item>
+                <item>wxART_FILE_OPEN</item>
+                <item>wxART_PRINT</item>
+                <item>wxART_HELP</item>
+                <item>wxART_TIP</item>
+                <item>wxART_REPORT_VIEW</item>
+                <item>wxART_LIST_VIEW</item>
+                <item>wxART_NEW_DIR</item>
+                <item>wxART_FOLDER</item>
+                <item>wxART_GO_DIR_UP</item>
+                <item>wxART_EXECUTABLE_FILE</item>
+                <item>wxART_NORMAL_FILE</item>
+                <item>wxART_TICK_MARK</item>
+                <item>wxART_CROSS_MARK</item>
+                <item>wxART_ERROR</item>
+                <item>wxART_QUESTION</item>
+                <item>wxART_WARNING</item>
+                <item>wxART_INFORMATION</item>
+                <item>wxART_MISSING_IMAGE</item>
               </content>
             </object>
             <flag>wxRIGHT|wxEXPAND</flag>
@@ -301,7 +305,7 @@
               <object class="sizeritem">
                 <object class="wxButton" name="BUTTON_BROWSE">
                   <label>Browse...</label>
-                  <size>55,-1</size>
+                  <size>30,-1d</size>
                 </object>
               </object>
             </object>