wxGridBahSizer support

exception handling while loading resource

some fixes (GetFirstChild, XRCID instead of FindByName, ...)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/tools/XRCed/CHANGES.txt b/wxPython/wx/tools/XRCed/CHANGES.txt
index dff8641b48897ba064d6df227f26df98b2559061..44cacbe57d2daeed6351ccf40ab7a14ffbf52fc0 100644 (file)
--- a/wxPython/wx/tools/XRCed/CHANGES.txt
+++ b/wxPython/wx/tools/XRCed/CHANGES.txt
@@ -1,3 +1,13 @@
+0.1.2-1
+_______
+
+Added support for wxGridBagSizer (supported in wxPython 2.5).
+
+0.1.1-5
+-------
+
+Added subclass attribute.
+

 0.1.1-4
 -------
 
 0.1.1-4
 -------
 

diff --git a/wxPython/wx/tools/XRCed/globals.py b/wxPython/wx/tools/XRCed/globals.py
index 01040c69612f740cd3f0fd16f79904ac405b8d5f..86a402ceb11d1f288a9fcd9d98e91f3cca236fd8 100644 (file)
--- a/wxPython/wx/tools/XRCed/globals.py
+++ b/wxPython/wx/tools/XRCed/globals.py
@@ -16,7 +16,7 @@ modernFont = wxFont(sysFont.GetPointSize(), wxMODERN, wxNORMAL, wxNORMAL)
 smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
 
 progname = 'XRCed'
 smallerFont = wxFont(sysFont.GetPointSize()-2, wxDEFAULT, wxNORMAL, wxNORMAL)
 
 progname = 'XRCed'

-version = '0.1.1-4'
+version = '0.1.2-1'

 
 try:
     True
 
 try:
     True

diff --git a/wxPython/wx/tools/XRCed/images.py b/wxPython/wx/tools/XRCed/images.py
index 167959b6819bb4e4a684ca8806e1099bc29f0d2c..ea68417fc00feb8fb4a1b0b5fe6aaacab1c5ba86 100644 (file)
--- a/wxPython/wx/tools/XRCed/images.py
+++ b/wxPython/wx/tools/XRCed/images.py
@@ -6,88 +6,6 @@ from wxPython.wx import wxEmptyIcon
 import cStringIO
 
 
 import cStringIO
 
 

-def getAutoRefreshData():
-    return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xf3IDATx\x9c\xb5\x94\xad\x16\xc30\x08\x85\xc9\xceD$\xb2\x8fX\x19Y\x89\
-\xacD\xee\x11\'+\xe76\xb3\xb6\x94AB\xbb\x13\\\x7fr\xbf\xc0\x05\x12"B\xcf\xb8\
-uU\x07\x80{\xf4\xc7\xe7\xb2\xbc\xf5\xbb\x011\xb5\xce\x852\x90\xe2\x0f\xe6*4\
-\x0cX\x0f[\xe2\xf2\xe6-H5\x03K\x9c\x88\x92\x86\x10\x91\x0b\t{0\x96\x12\xaa\
-\xb9\x8e\xe4\xb5\xa9\x97\xbaW\x1e\x0f\x1e\x06Hs\x89(-\xd3\xf1;g\xde\xcaw\n\
-\xa0\x85\x01\x00Vq\xce\x0cc)\x90g\x1f\xe2z0 \xa6\xd5<}\x08\xe7\xfd[+\xdc\x0c\
-Z\xa1K\x04`gpiU\xc8\x12\xbd\xa6\xfa\xbf\xddwQs\xd0j\x93Z^\xbb\xc1\x97\x00\
-\x12$\x9fq>\xf6<g\xde\x80:\x9a&\xcbv\xd5\x06Z\xad\x0cp\xec\xbaS\xab\x82\xc4e\
-tV\xd6\x90\x01\x04Jd\xad\x06o}[\x11\x9e\x03\xcbl\xbda\xff\x02|\x85~ 5\xf1\
-\xd3\x80+\xd1}\xd0>\x19\xfd\x9b\x08\x1e\xad\xb3\x97\x00\x00\x00\x00IEND\xaeB\
-`\x82' 
-
-def getAutoRefreshBitmap():
-    return wxBitmapFromImage(getAutoRefreshImage())
-
-def getAutoRefreshImage():
-    stream = cStringIO.StringIO(getAutoRefreshData())
-    return wxImageFromStream(stream)
-
-def getAutoRefreshIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getAutoRefreshBitmap())
-    return icon
-
-#----------------------------------------------------------------------
-def getCopyData():
-    return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xc8IDATx\x9c\xed\x95;\x0b\xc30\x0c\x84\xe5\xe2\xc1\xe3\xfd\xd4\x8c\x195\
-v\xccO\xd5\xa8\xc1\x90\x0e!!\x0fI\xe4Q\x0f\x85\x1e\x08\x8c\x06}\xdc\xd9\xc2\
-\t\x00\xb5\xd4\xab\xe9\xf4?\xe0\x8c\xb2\xd5\x14\x91\xd1\xea\x03HW\x01\xae\
-\x03\xad\xba\xa9\x08|\x0b\xe0A\xafB\x92\xb5\x07"2jU*\xb9,\x83\xa73\x9bC\x80\
-\xc1\x8d.\x04\xecU\xf2\x9b\xb4\xf6\x87^\x04\t#*\xb9l\xca\x93\xd6\x9eD:3\xba\
-\x10`]\xf4\x1a\xbcwaAn9X\x03\xb5\xf6K\x11\x111\xf3\x06\xf2\xc8\xc1\x99\xf8\
-\xccE\x9b\x87\x1c\xc5\x0b\xf8\xacL\x00\x80\xb4\xb7JD\xd4u\xe2\xc2=\xa8\xeb\
-\x80\x99\x8dg7]\xe2c\x07\x91\xe6\x17\xd3\x04\x00\x0cft\x91\xccM\xfe\xa6~\xff\
-\xc3i\x0e\xf8\x00\xb4\xedw\x96)\x01f=\x00\x00\x00\x00IEND\xaeB`\x82' 
-
-def getCopyBitmap():
-    return wxBitmapFromImage(getCopyImage())
-
-def getCopyImage():
-    stream = cStringIO.StringIO(getCopyData())
-    return wxImageFromStream(stream)
-
-def getCopyIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getCopyBitmap())
-    return icon
-
-#----------------------------------------------------------------------
-def getCutData():
-    return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xb6IDATx\x9c\xcd\x94\xd1\r\xc4 \x0cC\xcdM\xe0Q3BF`\xd4l\xd0\xfbi\xee*\
-\xd4@@B\xc2R\xff\x1a\xbf\xe2\x98\x16\x92\xd8\xa9\xcfV\xf7c\x00fvm\x05\x00\
-\x80\xaa\xbeBF\xf04@DB\xf3\x08\x9e\x06\x90,\xad\x91\x9b\xd7Z\xbb\xb3%[S7$YZs\
-U-\xd1\xdct\x8b\xda8z\xe6S\x00\x8f\xc9w1\x8af\x1a\xf0\xa6\xd1\xd7\x03S;\x90;\
-\x1a\xbd\x1f\x80\xacC\xc0\xf4\t\x9e\xd1\x98\xc9\xf5\x07/\x02z&\xb5\xf2\xf7\
-\xce\x12\xc0\x07\xdd\xa8\xa7\xe8\xb2\x9d\xf1\xb3k\xe5\xcb\x151\x00\xfd\x13\
-\x0e[\xf4\xcc\xd7\x8d\xbc\x9e\xcfX\xa2\xca\xa6j\x9a1\x8a\x94\xbe\x07\xab:s\
-\xc9G\x01\xbe\xd4=_\xff?J\x99`\x00\x00\x00\x00IEND\xaeB`\x82' 
-
-def getCutBitmap():
-    return wxBitmapFromImage(getCutImage())
-
-def getCutImage():
-    stream = cStringIO.StringIO(getCutData())
-    return wxImageFromStream(stream)
-
-def getCutIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getCutBitmap())
-    return icon
-
-#----------------------------------------------------------------------

 def getIconData():
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00 \x00\x00\x00 \x08\x06\x00\
 def getIconData():
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00 \x00\x00\x00 \x08\x06\x00\


@@ -131,80 +49,55 @@ def getIconIcon():
     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getNewData():
-    return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00uIDATx\x9c\xed\xd5\xbb\n\xc0 \x0c\x05\xd0\x9b\xe2\x90\xf1~\xb2\x9f\x9c1\
-\x83`\xa7v\xf2EEJ\xa9\x01\x17\x03\x1e\x0c\x89\nI\xac\x8cc\xe9\xe9\x1b\x18\
-\x89\xd0J\x9aYn\xe5I\xca\x14\x00\x00\x9e\xbc\xb8\xafAaf\xb9\x87L\x95\xc8\x93\
-wo9\x05hP\x00\xedR>\x06<\xf9\xbd\x00 \xc6XD\xbe\xdf\xa6\x1b\xf8\x01\xd0}*\
-\xaeaZ\x02\x90\x94\xda\x00\x8d\x86\xec/\xf3u\xe0\x04ND$:\xe8\xc5\xf5\x91\x00\
-\x00\x00\x00IEND\xaeB`\x82' 
-
-def getNewBitmap():
-    return wxBitmapFromImage(getNewImage())
-
-def getNewImage():
-    stream = cStringIO.StringIO(getNewData())
-    return wxImageFromStream(stream)
-
-def getNewIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getNewBitmap())
-    return icon
-
-#----------------------------------------------------------------------
-def getOpenData():
+def getTestData():

     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
 \x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
 \x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\

-\x00\xc9IDATx\x9c\xed\x951\x0e\xc3 \x0cE?U\x07F\x1f\xaaC\x8f\xe5#p\x9c\x0e=\
-\x94G\x06$:\xa4T\x84\x04C\x11\x0c\x95\xfa\xa5\x88("\xefa;R\x0c\x11ae.K\xe9\
-\x7fAO\xae\xa3/\x8aHL\xf7Ddj\xfb\x86*\x10\x91HD&]I\x96KS\xcc\xac\xcf4\xc1\
-\xcbj\xaa-\xeamA\xb9\xb7\xcci\x05"\x12}\x00\x00\x0f\xc0\xc2*\x93j\xc9\x95\
-\x19lp\xc0\xc3\x07\xc0\x87\xe3\n\x00\xcc\\=}C`w\x92\xf3\xb5\x1d\xa5E{\x98\
-\xd6\xa6<\xddC.\xe1\x8fg\x1b~\xbfm-c\xe6\x8f\xa41\x03|\x05w\xce\x1d\x9e\xab\
-\x15\x8c\xc0\xf3\xd3\x03J\x053\xe0\x802\xe46z\x8b\x06\xaf\n\xde/tKjpU0+\xbf\
-\xff\xc3Y.x\x01\xfcgd\xb8c~\xd8\x9d\x00\x00\x00\x00IEND\xaeB`\x82' 
+\x01\x1eIDATx\x9c\xb5UK\x92\xc2 \x10}\r.r\x19G\x16.<N\xae0z\x8eh\x8e\x90\xe3\
+\xb8\x98\x05:\x97q\xe1\x0c.\xc6P|\x1a\xe8L)UTB\xa7y\x1f\x1a\x08\x91\xd2xgSoE\
+\x07\xb0\x92$\xb9\xdf\x1f\x97\xc6Hi\x92\xcc\xa5\xda\x12q\xc0K\x89X\x07\x9b\
+\x8f\xb5\x07\xb6\xd6V\t\xe6\xdc\xcb\xf5\x9b\'"\xa5\xa3n\x8cq\xb7;|\x07\xca=\
+\xcc3\xc6\xb8\x14\x8b\x94~m\x91O\xc7!_\xd2\x9a\xfa\x9a\x0b.\x8fs\xf1\xf2m\
+\x9a\xb9h\xa9\x0f\x1d\xa4\xef\x12\x17M\x07\xdds\x9f\xdd\xee\xf1\xb3\xab\x9c\
+\xa0\xd0\x85O\xb3\xd6\x16\'\xcd\xa0\xe1\xb8[\x95H\xe2m-\xaaA\nTS\x9f6q\x91g\
+\xd0%\xe0\x11\x81\xe4n\x91\x80\x8f\xe3\x18\x8d\xc5z\xc2:\xb4\x88>\xf7\x07/6Z\
+\xa2\x92\x0b\xae\xc8\\K\xd5g\x04\x12\xf0V<T\xcf\x12\x84.J \xdcwN=P\xa8\x01)M\
+\xa7\xe3\xe0v\xdb\t\x00p\xfe\xca\xaf\xec\xdd\xd6<\x81{\x1fK\xd5\x03\x8d\x1f\
+\x0e\xf0w*\xa7i\xca\xe2}_\x07\x16\x13\x84Di\xac\x06\xbc\x98\xe0\xbf\xed\x01\
+\xadi\xbd5\x87\xab\x8d\x95\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getOpenBitmap():
-    return wxBitmapFromImage(getOpenImage())
+def getTestBitmap():
+    return wxBitmapFromImage(getTestImage())

 
 

-def getOpenImage():
-    stream = cStringIO.StringIO(getOpenData())
+def getTestImage():
+    stream = cStringIO.StringIO(getTestData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getOpenIcon():
+def getTestIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getOpenBitmap())
+    icon.CopyFromBitmap(getTestBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getPasteData():
+def getTreeDialogData():

     return \
     return \

-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xcfIDATx\x9c\xed\x95\xb1\x0e\xc3 \x0cD\x8f\x8a\x81\xd1\x9f\x9a\xb1\xa3G\
->\xd7#\x03\x12\x1d*R\x02\xa6A$\x0c\x95zR\x14@p\x0f0\x18CDX\xa9\xc7R\xf7?`Dv\
-\xb4\xa3\x88\xa4\xb2NDfd\x9c\xe9\x9d\xa2\xda\x10\x00B|\xff\x9d2\xad\x1eP]\
-\x81\x88$f\xde\xeb\xcc\x8c\x10?\xc6\xb9\\\xf5I\x1a\xe44\x06\xd9<\x1b\x97\xe5\
-\x12\x90!C+\xa8\xa5m\xc9\xa8N\x87\xd6\xb3\xbc\x1dp\x84-\x06\x00@\x88\xcf\xa6\
-\xcdY\x0f@\xa7_\xd8\xdd\x16\xec\xacG}\xea\xa7n\xb2\xb3~\xff\xca6\xa0=IS+\xa8\
-\xb7)\xd7K\xe0%\x80f\xa4\xc5\xa6\x0b "\xa3]\x9a\x1c\xc8\x9e\xd90\xa0\x07\xd9\
-6Qg?\x05\x00\x00f>\xe4\x16"=\x1d|S7\x9b\xde\xa5\xdf\x7f\xd1^\xf7\xdbLY\x05\
-\x8av\xd9\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\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 getPasteBitmap():
-    return wxBitmapFromImage(getPasteImage())
+def getTreeDialogBitmap():
+    return wxBitmapFromImage(getTreeDialogImage())

 
 

-def getPasteImage():
-    stream = cStringIO.StringIO(getPasteData())
+def getTreeDialogImage():
+    stream = cStringIO.StringIO(getTreeDialogData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getPasteIcon():
+def getTreeDialogIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getPasteBitmap())
+    icon.CopyFromBitmap(getTreeDialogBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -212,16 +105,14 @@ def getRefreshData():
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
 \x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
     return \
 '\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
 \x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\

-\x00\xcaIDATx\x9c\xc5\x94\xc1\x11\x84 \x0cE\x93\x1d\x0b\xc8\xd1\x12=RBJ\xc8\
-\x91\x12=\xd2\x81{\x91\x19\xcc\x12\x082\xcc\xfe\x9b"\xff\xc17\t\x12\x11\xac\
-\xd4g\xa9;\x00l\xde\x0f\xcf\x94.\xfdn\'\xc2\xde>\xd7\rJ\xf3(\xd2\x84\xba\x01\
-ys\xcd\xbc<y\x0f\xd2\xbcA\xcd\x9c\x99QC\x98\xd9\x84\xb8\xff\xc1\x11\x82+s-\
-\xb4\xca\xd4\xba\xba\x15\x8f\x05w\x97i\x14\x81(\xf2\x88\xc3\x13S7\xa2\xb2jr\
-\xfe#2\x01;\x11\xe6S\xbd1\xee\x02f\x8d\xb3\x96\x8f\x8a\xff\x02\xce\x94\xaeV\
-\xa7N\x8d\x8a\x11\xa3\xb2\xd2\x86\x00\xdeqp\xaf\xcf5\xda\x11\xc2\xe3\xd9\x13\
-\x8f\x0bP\x1b\r\xd6\xf8\xae\xc9\x9cEZ\xb5\x13\xeb\t;\x05\xb8\x8d~ \xbdf\x1c\
-\x02\xbc\xd1\xf2F\xfb\x02O\x82o\x1e\xb4]1\xc3\x00\x00\x00\x00IEND\xaeB`\x82'\
- 
+\x00\xcaIDATx\x9c\xc5\x94\xc1\x0e\x83 \x10Dw\xa1\x17\xff\xd4#m\xbf\xa3\xed\
+\x1e\xf9SOjO$Hve\x90\x10\xe7\xa6\xd1y0,\xc3\xec<\x8d\x94\x1b\xeaND\x0f\xf4\
+\xc3e[\xf7\xf2\xdd\xe4<\xd7\xfe\x83v\x90\x9bG\x91S(\x0cH?k\xe6\xf9\xcak\x90\
+\xd3\x1dh\xe6\xcf\xd7\x9bK\xc8\xef\xfb1!\xf0\x19\xcc!@\x99\x97bkL\xad\xad[\
+\xf1XpxL\xa3\x08E\x91C\x1cHL\xd5\x88\xf2\xa9I\xf9\xb7\xc8\x04L\xcesZ\xd5\x15\
+\xe3*\xa0\xd78ixU\xdc\x0bX\xb6u?\xbb\xa9]U\xd1b\x94OZ\x13\x00\xad\x03"{ \xe0\
+3\x98C8<#\xf1@\x00\xad\x1a\xac\xfa\xd6dvQ)m\xc5e\xc3v\x01\x88\xf4s\xa8]\xc6&\
+\xc0\x15\r\xbfh\x7f\xefOoHY\xd1\x18*\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 def getRefreshBitmap():
     return wxBitmapFromImage(getRefreshImage())
 
 def getRefreshBitmap():
     return wxBitmapFromImage(getRefreshImage())


@@ -236,122 +127,75 @@ def getRefreshIcon():
     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getSaveData():
-    return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\x86IDATx\x9c\xed\x95\xb1\n\xc0 \x0cD\xb588\xde\'\xdf\';:\x14\xdaA\x04\
-\xa9\x1a\xdb\xa2\x14\xa5\x07"\x04\xb9\xa7IT\r@\x8d\xd46\xd4}\t\x80)\x05\x9ds\
-\xc7\x1b3\x00\xfa\x1a\xab\x9e\x80\x0c\xb3\xdf\xbd8\xd2\xb5$\xb3\x8duIQ\x04\
-\x944\x07@\xd2\xfc\x80b\x9bF\x91JYcE\x03)\xffM\xc0\x1d\x83\x96\xba\x00\x86tQ\
-z\xd1$-\xdaE\x004)?xiwI5\xa8\x169@\xf2\xc7\xeb\xa9\xf4\xffe~\x0e8\x01v84H\
-\x1c6\xc2\x8f\x00\x00\x00\x00IEND\xaeB`\x82' 
-
-def getSaveBitmap():
-    return wxBitmapFromImage(getSaveImage())
-
-def getSaveImage():
-    stream = cStringIO.StringIO(getSaveData())
-    return wxImageFromStream(stream)
-
-def getSaveIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getSaveBitmap())
-    return icon
-
-#----------------------------------------------------------------------
-def getTestData():
+def getToolRadioButtonData():

     return \
     return \

-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
-\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x01\x15IDATx\x9c\xb5U\xbb\x11\x830\x0c\x95s)Rj\x04\x8f@A\xc18\x8c\xa2\x11\
-\x18\x81qR\xa4\xf0\x08\x8c@I\xc1\x9d\xd3`\xb0\x85l\x8b\x1cQ\x83\x11\xf2\xfbH\
-\x06\x0c"\xc2?\xe3\xf1Wt\x00xj\x8a\xe6y\xf6<\x87\x88F\xb3\xd7\x94Z$\x01_%\
-\x12\x1dXkw`\xe7\\\x91 \xd4N\xd3$\x12\x9d\x1cXk\xfd\xfbs\x80\xbe\nM\\\xd6c\
-\xdd\xb5\x8dHr\xeb\x90\x89\xe8\xd4\xd2\xc4\x01W\x1fBr\x11\xab\x0f!\xb9\xb8\
-\xfd\x98r\x17\xbb\x83\x9cz\x80\xc3\xc1\xb2\xa6k)\xb8\x8b\xaa\x03\x0e\x18\xae\
-\xa5\xe1\xc7.\xf62\xe7\\v\x13W\x1b\x9c\xc8\xf5i\x17T3\xe0@%\xf5<\xd4C\x0e\
-\xa0W\xc0\x13\x02\xcd\xb7E\x03>\x0cCr\xaf\xd6\x13\xcf\xa1FDD\xf2)\xca\xb9\
-\x90\x86,\x05W\x7f"\xd0\x80\xd7\xf2\xb1z\x91 v\x91\x03\x91\x9eK\xea\x0123@DC\
-D\xbekG\x00\x00\x90\xde\xf0\xaem6\xe0~\xcfq\xf5\x00\x95\x1f\xce\xb6\xc9\x8f\
-\xe3x\xca\xf7}\x19XM\x10\x13\t\xb9\xea\xd1V\x13\xfc\x1a_\xfc\x89l\x9f\xd7k\
-\x04?\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\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\x9eIDATx\x9cm\x901\n\xc30\x0cE\x9fe(\x94.\x19z\x8c\x0e\x19=\xe4`\xb9@[\
+\x1d\xcbC\x87\x8c\x19z\x8c\x0c^JM\t8CIqR}\x10\x12\xe2}!>N<\xfbR\xd5b\xed\x85\
+\x9d\xee\xb7k\xa9{-\xb1\xc0\xbe\xef\xb1\x0cb\x81\xe3s4\rb\x81\x80ip\xaa\xfa\
+\x07\xd6j/-\xaa\n\x80s\xe2y\x7f^\x05`x\x0c4\xe7\xe6\x07\xa6)\x11\xba\x00\xc0\
+\xf1pr\xb2\x0e\x00\xa1\x0b\xa4)\x99\xe0\xf7t\x95c\x9es\xc9s.1\xc6\xb2\xce\
+\x9b\xac\x9d\xf8\xcd\x8f\xebK\x9b\x8bV\xce5\xb0\x07\x01\x16\xa1\xb8V\xdd~j\
+\xa0u\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTestBitmap():
-    return wxBitmapFromImage(getTestImage())
+def getToolRadioButtonBitmap():
+    return wxBitmapFromImage(getToolRadioButtonImage())

 
 

-def getTestImage():
-    stream = cStringIO.StringIO(getTestData())
+def getToolRadioButtonImage():
+    stream = cStringIO.StringIO(getToolRadioButtonData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTestIcon():
+def getToolRadioButtonIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTestBitmap())
+    icon.CopyFromBitmap(getToolRadioButtonBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeDefaultData():
+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\
     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 getTreeDefaultBitmap():
-    return wxBitmapFromImage(getTreeDefaultImage())
-
-def getTreeDefaultImage():
-    stream = cStringIO.StringIO(getTreeDefaultData())
-    return wxImageFromStream(stream)
-
-def getTreeDefaultIcon():
-    icon = wxEmptyIcon()
-    icon.CopyFromBitmap(getTreeDefaultBitmap())
-    return icon
-
-#----------------------------------------------------------------------
-def getTreeDialogData():
-    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' 
+\x00aIDATx\x9c\xed\x93\xc1\n\x80@\x08Dg\xb4_\xaa\xfc\xff[\xf5M\xb5\xdd\x96m\
+\xd1\xa8\xbc6\xe0A\x19\x07\x9e )\x8a\x8c\x06oX\x8e\xbd\xb4=E\x19\x06\xcc\xd3\
+x1/\xeb\x16\x9a]Q\x14fV(\x8a/\xe5"x\x18\x11R\rhQ\xde`\xd4\x80~\xe9\xeepn@\
+\xaf\x1f\xe19\x02\xb3\xbf \xa9m\x00\'\x0f\xb3\'\x06\x9f\r?\x1f\x00\x00\x00\
+\x00IEND\xaeB`\x82' 

 
 

-def getTreeDialogBitmap():
-    return wxBitmapFromImage(getTreeDialogImage())
+def getToolRootBitmap():
+    return wxBitmapFromImage(getToolRootImage())

 
 

-def getTreeDialogImage():
-    stream = cStringIO.StringIO(getTreeDialogData())
+def getToolRootImage():
+    stream = cStringIO.StringIO(getToolRootData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeDialogIcon():
+def getToolRootIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeDialogBitmap())
+    icon.CopyFromBitmap(getToolRootBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeFrameData():
+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\
     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' 
+\x00\x00\x7fIDATx\x9c\xed\x93\xb1\r\xc30\x0c\x04\x8f\xb6\n\x8f\xc2\xc2\x05G\
+\xd0\x88.Rp\x1c\x8d\xa1QT\x04\xb0+\xdbR\x02\xc4\x88\xd5\xa4\xc8W:<\xfe!\x89\
+\xa0\xc80\xd2\xa3\xa1+\xfd\x13\x05R\x9ee\xbd\x1b\x9e\xc2D\x00\xc89\x7f\x1dN)\
+\x01\xd5\x13t6t\xb6\xc3P5TO65\xac\xe2]\xdd\x7f\x10\xf6\x83?\x96\xc6poyy\xe1\
+\xb7\x82\x18cc\\\xf1Q\xe0\xee\x97\xd7\xfc$\x01n\x8f\x11@\xfe\xbb\xc0\x06\xdd\
+\xdc\x1d\x0b\xaa\xed\xd2\xa5\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTreeFrameBitmap():
-    return wxBitmapFromImage(getTreeFrameImage())
+def getTreeToolBarBitmap():
+    return wxBitmapFromImage(getTreeToolBarImage())

 
 

-def getTreeFrameImage():
-    stream = cStringIO.StringIO(getTreeFrameData())
+def getTreeToolBarImage():
+    stream = cStringIO.StringIO(getTreeToolBarData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeFrameIcon():
+def getTreeToolBarIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeFrameBitmap())
+    icon.CopyFromBitmap(getTreeToolBarBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -359,11 +203,11 @@ def getTreeMenuData():
     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\
     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' 
+\x00\x00bIDATx\x9ccddbf\x80\x81\xef\xbf\xbe\xfeg \x02p\xb0p002132000\xb0\xa0\
+K\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\\\x80\x119;\xff\xff\xf7\x97\xa8\xec\xcc\xc0\xc0\x00\xcf\xce\x00\x8f\x14\
+\x1a\x83K\xe9G\x81\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 def getTreeMenuBitmap():
     return wxBitmapFromImage(getTreeMenuImage())
 
 def getTreeMenuBitmap():
     return wxBitmapFromImage(getTreeMenuImage())


@@ -378,369 +222,539 @@ def getTreeMenuIcon():
     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeMenuBarData():
+def getToolDefaultData():

     return \
     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' 
+'\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\x9c\xc5\x92Q\n\xc00\x08C\x13\xdb\x8f\xde\xffD\x1e\xc3\x8b\x8c\
+\xc1`\xeb\xfek\x1d\x0c\x0b\xcdg\xd0\x07&\x92R\x90\x91\xa4\xb6W\x00\xeah\x9c\
+\xd7\xd1\xa3\xe1V\x1b(\x85\x9f\x00\x0003\xe7\xa9\xea\x14\xba?\x83\xf5!\x02\
+\xf1\xbd3q|\xa4\xfe\xdca\x0b\x00\\\x0b\x0e\xf0W\xfbCL\x03^\xd7\x11\x0f:g|b\
+\x05\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTreeMenuBarBitmap():
-    return wxBitmapFromImage(getTreeMenuBarImage())
+def getToolDefaultBitmap():
+    return wxBitmapFromImage(getToolDefaultImage())

 
 

-def getTreeMenuBarImage():
-    stream = cStringIO.StringIO(getTreeMenuBarData())
+def getToolDefaultImage():
+    stream = cStringIO.StringIO(getToolDefaultData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeMenuBarIcon():
+def getToolDefaultIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeMenuBarBitmap())
+    icon.CopyFromBitmap(getToolDefaultBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreePanelData():
+def getToolStaticTextData():

     return \
     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' 
+'\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\x00iIDATx\x9c\xd5SA\n\xc00\x08S\xbb\xff\xffX\xb3\x93\xe0J\x1ct\xa3\x8c\
+\xe5f\xb4I\x14\xaajCv\xc0\xb6\xa8~"\x8cp\xdc\xd5\x8f\x85\xdf\x82\n#\x1cjCYJ\
+\x84\x83m3sK\x89\xd3\xb0\x9a2\x8e\n\xe7\xa0\x88\xc8<\x9c|\x87\xda?\xbad+\x9b\
+0\\\x84kZf\xd4\xf5\xd9{\x9a\xb8C=\r;W5\xd5\xdf}\xe9\x13!\xebT\x08o\xae\xb7\
+\xaf\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTreePanelBitmap():
-    return wxBitmapFromImage(getTreePanelImage())
+def getToolStaticTextBitmap():
+    return wxBitmapFromImage(getToolStaticTextImage())

 
 

-def getTreePanelImage():
-    stream = cStringIO.StringIO(getTreePanelData())
+def getToolStaticTextImage():
+    stream = cStringIO.StringIO(getToolStaticTextData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreePanelIcon():
+def getToolStaticTextIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreePanelBitmap())
+    icon.CopyFromBitmap(getToolStaticTextBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeRootData():
+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\
     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/IDATx\x9ccddbf\xa0\x040Q\xa4\x9b&\x06\xfc\xff\xf7\xf7?14\x0c0R=\x0c\xd0\
+m $?\xea\x02Z\xba`\xe0\xd2\x01\xa9\x00\x00\xde\x90?\xcb\xfe\xa4\xd5\n\x00\

 \x00\x00\x00IEND\xaeB`\x82' 
 
 \x00\x00\x00IEND\xaeB`\x82' 
 

-def getTreeRootBitmap():
-    return wxBitmapFromImage(getTreeRootImage())
+def getToolSpacerBitmap():
+    return wxBitmapFromImage(getToolSpacerImage())

 
 

-def getTreeRootImage():
-    stream = cStringIO.StringIO(getTreeRootData())
+def getToolSpacerImage():
+    stream = cStringIO.StringIO(getToolSpacerData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeRootIcon():
+def getToolSpacerIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeRootBitmap())
+    icon.CopyFromBitmap(getToolSpacerBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeSizerFlexGridData():
+def getCopyData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xdbIDATx\x9c\xed\x951\x0b\x830\x10\x85\xdf%\x19\xf2sm\xbb\xb8\x14\x04\
+\x97.m\xfd\xa9\x1do\x88^\x07\xa9T\xbd\x0b\x8a\x95.>8\x88\x07\xb9\x8f\xf7L\
+\x08\x91\xf3\xd8Sn\xd7\xe9\x07`\x89\x82\xd6\x94\xae\x15\xadO\xce\xd3O\x00\
+\x00\xc0\x89G\xdf1DH\xd7\xcaZ\xc8\xaa\x888\xb1\xe9\xce\x12i\xf7@\xbaV81b\x88\
+\xc3\xe0~]\xe9C\\m\xba\xca\x02\xa6\x8a\xe1\x06N\xe5\xac\x97\x83d#\x8a!\x8e\
+\xca\x12\xa7\x12\xd2]\xd5\xe8\xb2\x00N<\xaa)x\xeaB\x85\x90\xf3\xb3\x02 \x9cX\
+\x00L\xaa\x12Nl\x16PI\xd34\xf2=k\x93\x83%\xf1\x99\xf7@\xdfT\r\xe0\xa5R\x01\
+\xe4<=\x1f\xf7Y\x9eE\xf12\xe1\x16\xd4tp:_\x94c\xd7\xff\xc4\xcd\x0er\xfa\x9c\
+\x98]\x00\xe4j5\xba\xec\x9e\xe3\xc9\xfc;\xe0\r\x05\xd7\x89\x15\x89\xed\x9f\
+\xd4\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTreeSizerFlexGridBitmap():
-    return wxBitmapFromImage(getTreeSizerFlexGridImage())
+def getCopyBitmap():
+    return wxBitmapFromImage(getCopyImage())

 
 

-def getTreeSizerFlexGridImage():
-    stream = cStringIO.StringIO(getTreeSizerFlexGridData())
+def getCopyImage():
+    stream = cStringIO.StringIO(getCopyData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeSizerFlexGridIcon():
+def getCopyIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeSizerFlexGridBitmap())
+    icon.CopyFromBitmap(getCopyBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeSizerGridData():
+def getAutoRefreshData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xfaIDATx\x9c\xb5T\xbb\x0e\x830\x0c<\'\x1d\xe8\x9f2\x06X*>\xa0\xea\xd2\
+\xd6c\xff\xb4,m:\x01\xc1\x8a\x93@\x95\x932\x90\xc7\x1d\xf6\xd9&2\x165a\xaa\
+\xb2\x038\x95^|\x7f?^\xee\x9d\x8d\xa5\xdc\xbb\xa2\x08B\xf2\x17sR\xb4X`~\x1c#\
+\x0f\xff<\'\x92\x8c F\xde\xf5\x03I\x91\xe7\xe3\xae\x8a\x14{\xd0:W\x94s\t\xd2\
+\xcaT\x0b]K\x8f&^,\x10\x9a\xdb\xf5\x03\xf9\xeb\xf6\x9c\x1b^\xd2\xb7K@\x12\
+\x03\xc0L\xce\r\xa3u\x0e\xcdM\x17Q=8\x1bK\xb3y\xf2\x11\x8d\xebY\x0ej\x049\
+\xc8\x14\x01\xf1\x08\x0e\x8d\x8a0E\xd3%}\xb7\xfa,\xca6Z\xaaS\xdd\xb4\x1a|H \
+\x14\n\xbfi\xdc\xd6<7\xbc\x08JdM\x0e\xcbU\x1a\x18+e@T\x1d\x19\x9b\\\x13\xe0\
+\xe7\xa5\xed3\xb3\xd7\xdegS\x14\x1b\r\xda\xf8\x8e\xa1\xb8\x0fbf\xcb\t\xfb\
+\x97\x00\x10\x1f\xcb)\xf2\xdd\x02GP\xbd\xd1~)\x14\xa25\xfeqL\x1d\x00\x00\x00\
+\x00IEND\xaeB`\x82' 

 
 

-def getTreeSizerGridBitmap():
-    return wxBitmapFromImage(getTreeSizerGridImage())
+def getAutoRefreshBitmap():
+    return wxBitmapFromImage(getAutoRefreshImage())

 
 

-def getTreeSizerGridImage():
-    stream = cStringIO.StringIO(getTreeSizerGridData())
+def getAutoRefreshImage():
+    stream = cStringIO.StringIO(getAutoRefreshData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeSizerGridIcon():
+def getAutoRefreshIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeSizerGridBitmap())
+    icon.CopyFromBitmap(getAutoRefreshBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeSizerHData():
+def getToolToolData():

     return \
     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' 
+'\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 getTreeSizerHBitmap():
-    return wxBitmapFromImage(getTreeSizerHImage())
+def getToolToolBitmap():
+    return wxBitmapFromImage(getToolToolImage())

 
 

-def getTreeSizerHImage():
-    stream = cStringIO.StringIO(getTreeSizerHData())
+def getToolToolImage():
+    stream = cStringIO.StringIO(getToolToolData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeSizerHIcon():
+def getToolToolIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeSizerHBitmap())
+    icon.CopyFromBitmap(getToolToolBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeSizerVData():
+def getToolTextCtrlData():

     return \
     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`@\x06\x01!\x01\xff\x19\x08\x80\rk60\xc2\xd8,\
-\x84\x14\xa0\x03t\x0b\x98\x08\xd9F\x08\x8c\x1a\x80#\x16\x88\x89J\xbc\x06\x8c\
-F#\x9d\r\xa08\x1a\x19\xd1\xb33\xa9\x00\x00&\x0c\x10mXtZ\x83\x00\x00\x00\x00I\
-END\xaeB`\x82' 
+'\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 getTreeSizerVBitmap():
-    return wxBitmapFromImage(getTreeSizerVImage())
+def getToolTextCtrlBitmap():
+    return wxBitmapFromImage(getToolTextCtrlImage())

 
 

-def getTreeSizerVImage():
-    stream = cStringIO.StringIO(getTreeSizerVData())
+def getToolTextCtrlImage():
+    stream = cStringIO.StringIO(getToolTextCtrlData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeSizerVIcon():
+def getToolTextCtrlIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeSizerVBitmap())
+    icon.CopyFromBitmap(getToolTextCtrlBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeStaticBoxSizerHData():
+def getToolScrollBarData():

     return \
     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' 
+'\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 getTreeStaticBoxSizerHBitmap():
-    return wxBitmapFromImage(getTreeStaticBoxSizerHImage())
+def getToolScrollBarBitmap():
+    return wxBitmapFromImage(getToolScrollBarImage())

 
 

-def getTreeStaticBoxSizerHImage():
-    stream = cStringIO.StringIO(getTreeStaticBoxSizerHData())
+def getToolScrollBarImage():
+    stream = cStringIO.StringIO(getToolScrollBarData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeStaticBoxSizerHIcon():
+def getToolScrollBarIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeStaticBoxSizerHBitmap())
+    icon.CopyFromBitmap(getToolScrollBarBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeStaticBoxSizerVData():
+def getToolComboBoxData():

     return \
     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\x00hIDATx\x9cc\x14\x10\x10`\xc0\x05>|\xf8\xf0_@@\x80\x11\xa7\x02\x06\
-\x06\x06&B\x9a?|\xf8\xf0\x9f$\x03\x02B\x02\xe0\x1a\x905\x07\x84\x04\xfc\x87a\
-\xa2\\\xc0\xc0\xc0\xc0\x80\xec\xfc\rk60nX\xb3\x01\xc3;8\r\x80i&;\x0c\x88\x05\
-\xc3\xc0\x00\x16l\x82\xe8QE\xb2\x01\xd8\xa2\x0b\x97\xe1\x03\x1f\x06\x03o\x00\
-\xc5\xb1\x00\x00\xf1\xda$S0&0\x03\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\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 getTreeStaticBoxSizerVBitmap():
-    return wxBitmapFromImage(getTreeStaticBoxSizerVImage())
+def getToolComboBoxBitmap():
+    return wxBitmapFromImage(getToolComboBoxImage())

 
 

-def getTreeStaticBoxSizerVImage():
-    stream = cStringIO.StringIO(getTreeStaticBoxSizerVData())
+def getToolComboBoxImage():
+    stream = cStringIO.StringIO(getToolComboBoxData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeStaticBoxSizerVIcon():
+def getToolComboBoxIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeStaticBoxSizerVBitmap())
+    icon.CopyFromBitmap(getToolComboBoxBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeToolBarData():
+def getToolTreeCtrlData():

     return \
     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\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' 
+'\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\xc1\n\x80@\x08Dg\xb4_\xaa\xfc\xff[\xf5M\xb5\xdd\x96m\
+\xd1\xa8\xbc6\xe0A\x19\x07\x9e )\x8a\x8c\x06oX\x8e\xbd\xb4=E\x19\x06\xcc\xd3\
+x1/\xeb\x16\x9a]Q\x14fV(\x8a/\xe5"x\x18\x11R\rhQ\xde`\xd4\x80~\xe9\xeepn@\
+\xaf\x1f\xe19\x02\xb3\xbf \xa9m\x00\'\x0f\xb3\'\x06\x9f\r?\x1f\x00\x00\x00\
+\x00IEND\xaeB`\x82' 

 
 

-def getTreeToolBarBitmap():
-    return wxBitmapFromImage(getTreeToolBarImage())
+def getToolTreeCtrlBitmap():
+    return wxBitmapFromImage(getToolTreeCtrlImage())

 
 

-def getTreeToolBarImage():
-    stream = cStringIO.StringIO(getTreeToolBarData())
+def getToolTreeCtrlImage():
+    stream = cStringIO.StringIO(getToolTreeCtrlData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeToolBarIcon():
+def getToolTreeCtrlIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeToolBarBitmap())
+    icon.CopyFromBitmap(getToolTreeCtrlBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getUndoData():
+def getToolCheckBoxData():

     return \
     return \

-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x17\x00\x00\x00\x16\x08\x06\
-\x00\x00\x00+v\x07\x05\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xb6IDATx\x9c\xed\x93\xb1\r\x830\x10E\x9f#\n\xca+3\x02\x03d\x80\x8c\xc1\
-\x18)S\xa6L\xc9\x18\x8c\x91"%\x030\x82\xcb+]X"E\x04\x8a\x901\x08\x07\x89\x82\
-W\x9e\xe4\xf7\xed\xbb\xb3\x11\x11\xb6\xe2\xb4\x99\xf9\x90\xaf\x96\xabj\xb7\
-\x89<E\x0c\x90\xc5\xc4\xcf\xeb\x19\xe7\xe1\xf1\xb6C\x88\x88\x98\xa5r\x13\xda\
-\xf3^\x9cg9\xce;\x00\x9c\x07uP5vqHP\xfe\x1b\x00p\x7f\xd9\xa1~\xbb|kUcg\x03&\
-\xe5}\xc0\xf8\x96\xaa\xda\x95\x85P\xb7:+\x8f\x0e4tXDL\xdd*e!\xb3\x03\x8f\xde\
-<F\xe8Uc\xf6\xfbC\x93z>\x85\xaavI\xab\xf8\x0f\xf6\xdb\xf3C\xbe\x8a\x0fa\xd1E\
-H\xfdNS\x0c\x00\x00\x00\x00IEND\xaeB`\x82' 
+'\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 getUndoBitmap():
-    return wxBitmapFromImage(getUndoImage())
+def getToolCheckBoxBitmap():
+    return wxBitmapFromImage(getToolCheckBoxImage())

 
 

-def getUndoImage():
-    stream = cStringIO.StringIO(getUndoData())
+def getToolCheckBoxImage():
+    stream = cStringIO.StringIO(getToolCheckBoxData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getUndoIcon():
+def getToolCheckBoxIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getUndoBitmap())
+    icon.CopyFromBitmap(getToolCheckBoxBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getRedoData():
+def getTreeFrameData():

     return \
     return \

-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x17\x00\x00\x00\x16\x08\x06\
-\x00\x00\x00+v\x07\x05\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
-\x00\xbfIDATx\x9c\xed\xd4/\x0e\xc20\x14\xc7\xf1\xef\xc8\xc4\x13\x13=\x06r\
-\x129\x81@"v\x00\x04\x87B\xec\x08\x88\x1d\x00\xd1#Lr\x8c\'\x10uE\x90\x92\x10\
-6\xda4, \xf6\x93M\xf3y/\xaf\x7f\nc\x0cse5\x9b\xbc\xe0_\xc7U\xd5\xcf\x86\xa7\
-\x14(s\xb1\xdda\x83\x88\xd0\x9f\xac7\xc6\x14c\xfb\x8b\x94{\x1e\xd0\xa6\xad\
-\x91J\x90R\x00\x90\n\xdc\r\xfa\xce2V \xda\xb9\xaa\xfa\xa6\xad\x01\xb0\xe7\
-\xe1\xb9\xbe?687\r\'\xe1\x8f\x02\x8e\xe1r}A\xfa\xcez`\x12\x86\xc8\x81\xaa\
-\xaa\xaf\xb7\xeb78\xe4\x13\x0c\x91\x99\x87Y\xc7\x90\xa9\xfc\xee\x11\xe5v\x9c\
-\x84\x87\x02)\xafq,I\xf7<7\xff\xf9q-xv\xee"\x1b=\x87\xa0\x01\x91\x87\x00\x00\
-\x00\x00IEND\xaeB`\x82' 
+'\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 getRedoBitmap():
-    return wxBitmapFromImage(getRedoImage())
+def getTreeFrameBitmap():
+    return wxBitmapFromImage(getTreeFrameImage())

 
 

-def getRedoImage():
-    stream = cStringIO.StringIO(getRedoData())
+def getTreeFrameImage():
+    stream = cStringIO.StringIO(getTreeFrameData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getRedoIcon():
+def getTreeFrameIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getRedoBitmap())
+    icon.CopyFromBitmap(getTreeFrameBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolDefaultData():
+def getToolStaticBitmapData():

     return \
     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' 
+'\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\xd8IDATx\x9c\x85\x93/l\xdb@\x14\x87?;\xd6t\xd3\x06\x0e\x04\x1c4\
+(\x08\x1c\x0c4(0\x18\x08(\x08\x19\xab\xb4j*0\x18(\x18(\x0c\x18\x08(\x08\x0c\
+\x18((0(\x08(\x08(0(0(\x08\x0c(0(\xb8M\xa9\xf6\xb4y{\x03\xa9\xddD\xcd\xb6\
+\x87\xee\xde\xbd\xef\xfd\xf9=]\x10\x84\x1d6\xed\xfb\x8f\x07e\x87\xbd|\xf1*\
+\xd8\xbc\x87\x9b@\x03\xc9J(oJ\xbc\xf7\x7fM\x18\x04a\xa7u\x16\xd7\x05\xf9\xc5\
+\x94\x93\xac\x87\x89\x0c\xb2\x12\x8a[\xcf\xf9e\xc9t\x9aoUn\xc1\xe2\xba\xc09\
+\x83e\x8eu}\xc0\x82\x14H-\xf8{\xcf\xc9h\xc1\xf4\xcb\xb4\x85\xc3\xa6\xda\xf8l\
+\x8c\x8b\xe6\xd8n\x02Q\x0c\x91\x85\xd7)&2Xk99t\x0c\x0f\x86m\xabQs\xc8\x0eS0\
+\x80qkG-\x00Hm0\x91`\xbb\x06kM;o+\x8e\x88\xb4\xc1` \xb2\x88\xac\xc5\x11\x0cD\
+\x06g\x9bw\x08\x9baGg\xf9#(P{\x90%\xd4\xd5\xdaW\x0b\xe2=\xe7\x17\xf3\xe7\xeb\
+\x98L&H\xfd\xd8bd\x10Y\x02\x1ej\xa1\xaa*\x96w\x9e\xd3\xd1\xb8\x15\xa7\x9d\
+\xd1\x18\x83\x11\x01\x0c\xb2ZB\xed\x11\xf1TU\x85\xac\x84\xd1d\xc1\xecj\xb2\
+\xbdG\x80\xf7\x1f\xdeiY\xcc\x89\xf7z\x8c?%x\xefY\xdeU\x9c~\x9ec\xbb=\xf2\xcb\
+\xed=\x12\x84\x1d\x82\xb0\x03\x11:8H\xb5\xbc-\xb5(\xe6\x9a\xbeM4;\x1e\xeab\
+\xb1P\xa9E\xa5\x16mb\x83\xb0\xf3\x04\x0e\x06\xa9J-Z\xdc\x14\x9a\xec\'\x9a}\
+\xcc\xb4\xba\xaf\x9e\x01[\xa0sNgW3M\xd3D\xc7\xe3\x91\x1e\x1d\x1f\xa9\xed\xda\
+\x9d\xc0\x16\x08h\xb2\xdf\xd7<\xcf\xd7\x15\x93D\xe3\xbd\xf8\xff`\x03\xc7\xb1\
+\xd3~\xff\x8dfY\xf6O(\x08;O\xaa\xea\xef_\xea\x9cED\xf8\xfa\xed\xe7\xd6\xdf\
+\xdbe\x7f\x00\x87I\xfd\tls\xb0\xfe\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolDefaultBitmap():
-    return wxBitmapFromImage(getToolDefaultImage())
+def getToolStaticBitmapBitmap():
+    return wxBitmapFromImage(getToolStaticBitmapImage())

 
 

-def getToolDefaultImage():
-    stream = cStringIO.StringIO(getToolDefaultData())
+def getToolStaticBitmapImage():
+    stream = cStringIO.StringIO(getToolStaticBitmapData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolDefaultIcon():
+def getToolStaticBitmapIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolDefaultBitmap())
+    icon.CopyFromBitmap(getToolStaticBitmapBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolDialogData():
+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\
     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' 
+\x00\x00?IDATx\x9ccddbf\x88O\x8a\xfd\xcf@.`dbfHHI\xf8\xcf\xc8\xc4\xcc\x80\
+\x8c\xb1\x89aS\xc3D\xb6\xcdP0\xf0\x060\x8e\x06\xe2\xa8\x01\xd40\x80\xe2\x84\
+\xc4\xc8\xc8\xc4L\x91\x0b\x00\xb7J\x13\xf6R\x88\'\x0b\x00\x00\x00\x00IEND\
+\xaeB`\x82' 

 
 

-def getToolDialogBitmap():
-    return wxBitmapFromImage(getToolDialogImage())
+def getToolFlexGridSizerBitmap():
+    return wxBitmapFromImage(getToolFlexGridSizerImage())

 
 

-def getToolDialogImage():
-    stream = cStringIO.StringIO(getToolDialogData())
+def getToolFlexGridSizerImage():
+    stream = cStringIO.StringIO(getToolFlexGridSizerData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolDialogIcon():
+def getToolFlexGridSizerIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolDialogBitmap())
+    icon.CopyFromBitmap(getToolFlexGridSizerBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolFrameData():
+def getOpenData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xccIDATx\x9c\xed\x95A\x0e\x820\x10E_\x8b\x8b\x1e\xcc\x85\xd7Q\xcf\xa1r\
+\x1c\x16\x1e\xac\x0bJ]\x90\x12(t\x06\t,L\xfc\t\x81\x90\xf2^g\xa6\t\xc6\xd8\
+\x8a#c\x0f\xa5\xff\x05kr\xda\xfaa\xecBL\xcf\xc6V\xa6\xb4nS\x05\xb1\x0b\xd1\
+\xd8\xca\xa4+\xc9\xc6\xd2A\xbe\xd71M\xf0\xbc\x9ab\x8b\xd6\xb6 _\x9bg\xb1\x82\
+\xd8\x85\xe8[\x00\x0f8\x9c0)M.\xcc\xa0\x87\x83\xc7\xb7\xe0\xdb\xf9\x1d\xe0\
+\xf5|\x14w\xaf\x08\xdcD\xb2|\xd7#\xb4h\n\x93\xda4\x01\xae\x1dr\x0eo\xde:\xfc\
+r\xee[v\xbd\xdd\x07\x892\x03\xbe\x82\xd7u={/V\xb0\x05>\xde=\x08\x15\xec\x01\
+\x07a\xc8:\xba\x8f\x04/\n@?\xdf\xe3\x94\xe0\xa2`\xaf\xfc\xfe\x0f\xe7p\xc1\
+\x07\x0c,c\x92\xc7/.\x8c\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolFrameBitmap():
-    return wxBitmapFromImage(getToolFrameImage())
+def getOpenBitmap():
+    return wxBitmapFromImage(getOpenImage())

 
 

-def getToolFrameImage():
-    stream = cStringIO.StringIO(getToolFrameData())
+def getOpenImage():
+    stream = cStringIO.StringIO(getOpenData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolFrameIcon():
+def getOpenIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolFrameBitmap())
+    icon.CopyFromBitmap(getOpenBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolMenuBarData():
+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 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\
     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=IDATx\x9ccddbf\x88O\x8a\xfd\xcf@.`dbfHHI\xf8\xcf\xc8\xc4\xcc\x80\r\
+\x13\x92c"\xdbf(\x185\x80\x81\x81q4\x1a\x87\x83\x01\x14G###\x133E.\x00\x00\
+\x18\x10\x13\xf6M^\xe8\x9a\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 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 getCutData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xc9IDATx\x9c\xcdTA\x0e\xc3 \x0cs\xc2\x07\xf6T\xb6\x9d+M\xday[\x9e\xda\
+\x0f\xac\xec\xd2l\x88\x15\x02HHX\xca\xa5ml\xe2\x98\x12\xb1\xc3H\xf0P\xf6i\
+\x04\xc2\xf6\x0eC\x05\x00\xe0\xf5|\x1c\x8a\x98\xe2\xc4\xce,\x00\x01@\xc8=\
+\x17\x91\xbfwZU\x13\x10;J\xa7\xd0\x93\x8bH\xb9\xb76\xa6JH\xec(%?_\xae\x94\
+\xebkNQ\xba\x8b\x12y\x93\x80\xda\xe4\xbd\x07`[\xd3,p\x04\xeb\xf4@\xd3\x0e\
+\x96\xdd\x9a\xdb^\x00\xf1\xdd\x14h\x9e \xb6&lK\xf8\tw\n\x94HDN\xdfo\xba\x04\
+\xb4Q\x89J\xc8\xdd\xf49~v)t\xb9\xde\xaf\x00\xca\x13\x9a)\x8a\xfdU"\x8dglK.\
+\xb2U1\xad!\xca\xa1\xfa\x1e\xf4b\xce%O%\xf0\x01\x1c\x13_\xd0\xfc\xb7\xc0\x00\

 \x00\x00\x00\x00IEND\xaeB`\x82' 
 
 \x00\x00\x00\x00IEND\xaeB`\x82' 
 

-def getToolMenuBarBitmap():
-    return wxBitmapFromImage(getToolMenuBarImage())
+def getCutBitmap():
+    return wxBitmapFromImage(getCutImage())

 
 

-def getToolMenuBarImage():
-    stream = cStringIO.StringIO(getToolMenuBarData())
+def getCutImage():
+    stream = cStringIO.StringIO(getCutData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolMenuBarIcon():
+def getCutIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolMenuBarBitmap())
+    icon.CopyFromBitmap(getCutBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getTreeSizerGridData():
+    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\x9ccddbf\x88O\x8a\xfd\xcf@.`dbfHHI\xf8\xcf\xc8\xc4\xcc\x80\r\
+\x13\x92c"\xdbf(\x185\x80\x81\x81q4\x1a\x87\x83\x01\x14G###\x133E.\x00\x00\
+\x18\x10\x13\xf6M^\xe8\x9a\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeSizerGridBitmap():
+    return wxBitmapFromImage(getTreeSizerGridImage())
+
+def getTreeSizerGridImage():
+    stream = cStringIO.StringIO(getTreeSizerGridData())
+    return wxImageFromStream(stream)
+
+def getTreeSizerGridIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getTreeSizerGridBitmap())
+    return icon
+
+#----------------------------------------------------------------------
+def getTreeMenuBarData():
+    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\x00aIDATx\x9c\xed\x93\xb1\r\x800\x0c\x04\xcf!E\xc6\xca\x98\x19\xc7cx\
+\x94\x14HP "7)\x88\x0b(\xb8\xf2\xa5\x7f\xbdmY$mDH!\xf7\'\x02\xa4\xef\xfdX5\
+\x97\\\xc8\x00f\xf6\xd8\xac\xaa\x00W\x80\x17<\xb5\xd6\xa9~\xf3\xfe\x12\xc7\
+\x08\xbe\x96g\xa6\x8f\x80\xd6Z\xa8\x81\x00\xcbg\x04\x90\xff\x178\x01o\x9c\
+\x13?\x15\xa3\xaau\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getTreeMenuBarBitmap():
+    return wxBitmapFromImage(getTreeMenuBarImage())
+
+def getTreeMenuBarImage():
+    stream = cStringIO.StringIO(getTreeMenuBarData())
+    return wxImageFromStream(stream)
+
+def getTreeMenuBarIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getTreeMenuBarBitmap())
+    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\
+\x00gIDATx\x9c\xc5RA\n\x800\x0cK\xbb\x1d\xf6\xac>}\xcf\xe8GD\x10t\x9e*\x0cu\
+\x16\xaa\x98S[H\x9a@\x888!\x02\x0e\xb1\x01d\x1b\xe6ej^R\xc9\x05\xc4\x89:\x01\
+\x00P\xd5Gr\xad\xb5\xdb\xdf\x8b0\xfab\x10\x91\xd3-\xec\xe0\x9b\x08WV]\x02w\
+\xd9G kb\xdbVw\x0f\x00\x1c=\xa0\xdf\xab\x1c\x16\xd8\x01n\xd6\x12\xfe\x01\x8c\
+\x8ep\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
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -748,11 +762,11 @@ 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\
     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' 
+\x00\x00bIDATx\x9ccddbf\x80\x81\xef\xbf\xbe\xfeg \x02p\xb0p002132000\xb0\xa0\
+K\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\\\x80\x119;\xff\xff\xf7\x97\xa8\xec\xcc\xc0\xc0\x00\xcf\xce\x00\x8f\x14\
+\x1a\x83K\xe9G\x81\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 def getToolMenuBitmap():
     return wxBitmapFromImage(getToolMenuImage())
 
 def getToolMenuBitmap():
     return wxBitmapFromImage(getToolMenuImage())


@@ -767,206 +781,261 @@ def getToolMenuIcon():
     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolPanelData():
+def getToolBitmapButtonData():

     return \
     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' 
+'\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 getToolPanelBitmap():
-    return wxBitmapFromImage(getToolPanelImage())
+def getToolBitmapButtonBitmap():
+    return wxBitmapFromImage(getToolBitmapButtonImage())

 
 

-def getToolPanelImage():
-    stream = cStringIO.StringIO(getToolPanelData())
+def getToolBitmapButtonImage():
+    stream = cStringIO.StringIO(getToolBitmapButtonData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolPanelIcon():
+def getToolBitmapButtonIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolPanelBitmap())
+    icon.CopyFromBitmap(getToolBitmapButtonBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolRootData():
+def getToolListBoxData():

     return \
     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' 
+'\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 getToolRootBitmap():
-    return wxBitmapFromImage(getToolRootImage())
+def getToolListBoxBitmap():
+    return wxBitmapFromImage(getToolListBoxImage())

 
 

-def getToolRootImage():
-    stream = cStringIO.StringIO(getToolRootData())
+def getToolListBoxImage():
+    stream = cStringIO.StringIO(getToolListBoxData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolRootIcon():
+def getToolListBoxIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolRootBitmap())
+    icon.CopyFromBitmap(getToolListBoxBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolCheckBoxData():
+def getToolCheckListData():

     return \
     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' 
+'\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 getToolCheckBoxBitmap():
-    return wxBitmapFromImage(getToolCheckBoxImage())
+def getToolCheckListBitmap():
+    return wxBitmapFromImage(getToolCheckListImage())

 
 

-def getToolCheckBoxImage():
-    stream = cStringIO.StringIO(getToolCheckBoxData())
+def getToolCheckListImage():
+    stream = cStringIO.StringIO(getToolCheckListData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolCheckBoxIcon():
+def getToolCheckListIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolCheckBoxBitmap())
+    icon.CopyFromBitmap(getToolCheckListBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeToolData():
+def getToolSpinButtonData():

     return \
     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' 
+'\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\x89IDATx\x9c\x9d\x90\xc1\r\x80 \x10\x04\xf7\x0e\xcb\xf1a\t\x14\xe4\xc3R\
+xX\x10e\xd0\x88\xd1\x10\xf5|\x81\x02\xa2F\x92\xfd\xdcM\xd8\xbd%b\x85\xb7\xc7\
+\xf9`\xf6\x93<B\xb3\x9f\xc49\x07\xd97\xb9\x85\x02\x00\x00f4\t\xc89\x00\x00Z\
+\xeb\x04l\xc2\xc2Z[O\xbe\xac\x8b\x00x\x14\xfd\xaa\xa0jW\x93\x19\xcdi\x97_\
+\x17\x0e\x19\xfa\x01\xc4\x8ab\xa6\x1c\xec\xda\x0e\xc4\x8a\xaa\x99\x8a:\x88UT\
+\x92\xe32/*\x90}\x93`\x13?\xfa\xd2\xd3\x01\x07\x1fs\xbd~0\xc6_\x00\x00\x00\
+\x00IEND\xaeB`\x82' 

 
 

-def getTreeToolBitmap():
-    return wxBitmapFromImage(getTreeToolImage())
+def getToolSpinButtonBitmap():
+    return wxBitmapFromImage(getToolSpinButtonImage())

 
 

-def getTreeToolImage():
-    stream = cStringIO.StringIO(getTreeToolData())
+def getToolSpinButtonImage():
+    stream = cStringIO.StringIO(getToolSpinButtonData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeToolIcon():
+def getToolSpinButtonIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeToolBitmap())
+    icon.CopyFromBitmap(getToolSpinButtonBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolToolData():
+def getTreeStaticBoxSizerHData():

     return \
     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' 
+'\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\x9c\xed\x92\xd1\n\x800\x08E\xbd\xdao\x8e\xc9\xd8w\x05\xd1w.{\
+\xe9a\xad\xa8\xad\x05\xbdt@\x04\x85\x83\\\x04X\xa8\x07.\x07\xb6${,\xb0%\x19X\
+\xd0"\x19\x88\x88|p6\x8d3\xca\x0b|p\xf7"\xb0\x90F\xb5-\x8b]\xcfwg\xa5Q\x8d\
+\x0b\x19\xf2^\xc3!\xc4V~\xc1\x0b\x02\x80\xa5\xeea\xae\x04=|\x9f\xc1\n5\x8d!\
+\x0c\xe9\x92\xca\xdd\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolToolBitmap():
-    return wxBitmapFromImage(getToolToolImage())
+def getTreeStaticBoxSizerHBitmap():
+    return wxBitmapFromImage(getTreeStaticBoxSizerHImage())

 
 

-def getToolToolImage():
-    stream = cStringIO.StringIO(getToolToolData())
+def getTreeStaticBoxSizerHImage():
+    stream = cStringIO.StringIO(getTreeStaticBoxSizerHData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolToolIcon():
+def getTreeStaticBoxSizerHIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolToolBitmap())
+    icon.CopyFromBitmap(getTreeStaticBoxSizerHBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolMenuItemData():
+def getTreeStaticBoxSizerVData():

     return \
     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\
-' 
+'\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\x00gIDATx\x9c\xdd\x91A\n\xc0 \x0c\x047\xb1\xdf\x14\xc1\x87\t\xe2;5=)\
+\xd2\x1a\xaa\xedAh \x97\x90\x1d\x92]"6\xd0JJ\x16bC\xea\x02\x00~\x12K\xc9\xb2\
+\x04p\xde6A/v\xdeJ\xed\xa9\x0b\x00\xa0??\x86D1\xa4\xdb;*\xa0\x8a_{0[?\x00\
+\x1c\xa3\xe15\xaae\xc0(.\r\xbe\xdf\x83\xfd\x80\xcf)\x9cv)$\xa7EIx_\x00\x00\
+\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolMenuItemBitmap():
-    return wxBitmapFromImage(getToolMenuItemImage())
+def getTreeStaticBoxSizerVBitmap():
+    return wxBitmapFromImage(getTreeStaticBoxSizerVImage())

 
 

-def getToolMenuItemImage():
-    stream = cStringIO.StringIO(getToolMenuItemData())
+def getTreeStaticBoxSizerVImage():
+    stream = cStringIO.StringIO(getTreeStaticBoxSizerVData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolMenuItemIcon():
+def getTreeStaticBoxSizerVIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolMenuItemBitmap())
+    icon.CopyFromBitmap(getTreeStaticBoxSizerVBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolFlexGridSizerData():
+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 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\
     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' 
+\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 getToolFlexGridSizerBitmap():
-    return wxBitmapFromImage(getToolFlexGridSizerImage())
+def getToolUnknownBitmap():
+    return wxBitmapFromImage(getToolUnknownImage())

 
 

-def getToolFlexGridSizerImage():
-    stream = cStringIO.StringIO(getToolFlexGridSizerData())
+def getToolUnknownImage():
+    stream = cStringIO.StringIO(getToolUnknownData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolFlexGridSizerIcon():
+def getToolUnknownIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolFlexGridSizerBitmap())
+    icon.CopyFromBitmap(getToolUnknownBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getTreeMenuItemData():
+def getRedoData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x17\x00\x00\x00\x16\x08\x06\
+\x00\x00\x00+v\x07\x05\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xb5IDATx\x9c\xed\x94!\x12\xc20\x10E_\x92\x8a\x88\x1e\x04\x19\x89\x8c@ +\
+z\x00\x04\x82#!8\x02\xa2G\xe8\x118\x0c\x02\xd3.\x82\t\xa2\x944\xed\x90\xc1\
+\xf4\xcf\xac\xf9\x99}\xbb\xd9\xc9F)m\xc8%\x9d\x8d\xbc\xc2\x7f\x0e\x97\xbe\
+\x93l\xf0\x94\x02\xb3\xe0\xd2w\x12b\x7f\xd8R\x9d|\xb4\x80Jy\xe7\x01\xe0k\x87\
+--\xb6\xb0\x00\xd8\x12\x1ewh.-J\x1b5\x1b.}\'\xbev\x00\xb4\xd7\xdb\xdb\xaf\
+\x8e\x1e\nh\xce\xe3\xe0\x17]\x9bh\x00\xe2v\x1b\x01d\xe8\x0f\xbd\x8f\xdc%\xe0\
+p6\xd5Xt,a\xd6_\xaf=\xa1\xff-\xd1\xd2\x8e\x93\xe0\xa1@\xca6\x8e\xe6\xae\xff\
+\xf9\nO\xd6\x13=\xfb@\x04\x96\xa1\x8d\x9c\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getTreeMenuItemBitmap():
-    return wxBitmapFromImage(getTreeMenuItemImage())
+def getRedoBitmap():
+    return wxBitmapFromImage(getRedoImage())

 
 

-def getTreeMenuItemImage():
-    stream = cStringIO.StringIO(getTreeMenuItemData())
+def getRedoImage():
+    stream = cStringIO.StringIO(getRedoData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeMenuItemIcon():
+def getRedoIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeMenuItemBitmap())
+    icon.CopyFromBitmap(getRedoBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolToolBarData():
+def getTreePanelData():

     return \
     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' 
+'\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 getToolToolBarBitmap():
-    return wxBitmapFromImage(getToolToolBarImage())
+def getTreePanelBitmap():
+    return wxBitmapFromImage(getTreePanelImage())

 
 

-def getToolToolBarImage():
-    stream = cStringIO.StringIO(getToolToolBarData())
+def getTreePanelImage():
+    stream = cStringIO.StringIO(getTreePanelData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolToolBarIcon():
+def getTreePanelIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolToolBarBitmap())
+    icon.CopyFromBitmap(getTreePanelBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -995,70 +1064,165 @@ def getToolChoiceIcon():
     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolSpacerData():
+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 getTreeRootData():

     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\
     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' 
+\x00aIDATx\x9c\xed\x93\xc1\n\x80@\x08Dg\xb4_\xaa\xfc\xff[\xf5M\xb5\xdd\x96m\
+\xd1\xa8\xbc6\xe0A\x19\x07\x9e )\x8a\x8c\x06oX\x8e\xbd\xb4=E\x19\x06\xcc\xd3\
+x1/\xeb\x16\x9a]Q\x14fV(\x8a/\xe5"x\x18\x11R\rhQ\xde`\xd4\x80~\xe9\xeepn@\
+\xaf\x1f\xe19\x02\xb3\xbf \xa9m\x00\'\x0f\xb3\'\x06\x9f\r?\x1f\x00\x00\x00\
+\x00IEND\xaeB`\x82' 

 
 

-def getToolSpacerBitmap():
-    return wxBitmapFromImage(getToolSpacerImage())
+def getTreeRootBitmap():
+    return wxBitmapFromImage(getTreeRootImage())

 
 

-def getToolSpacerImage():
-    stream = cStringIO.StringIO(getToolSpacerData())
+def getTreeRootImage():
+    stream = cStringIO.StringIO(getTreeRootData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolSpacerIcon():
+def getTreeRootIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolSpacerBitmap())
+    icon.CopyFromBitmap(getTreeRootBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolStaticTextData():
+def getToolStaticLineData():

     return \
     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' 
+'\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 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\xa3IDATx\x9c\xed\x95Q\n\xc3 \x0c\x86\x13+\x82x\xd1\\f\xb4\x94=x\xd1\
+\xd2R\xa6\xe9S\xc6Z\xa6\x1da\xa3\x0c\xfc!\xa0\x90\xf8%!AD\xd3AM\x9c\x13\xa3\
+\xe9\xb0\xeaT\x91\xd1\x06~\x05 \xd9sN\xac\x05\xd8~\xbc\xed\x82\x89\x08\xbc\
+\x0b\xd5\x96\xcc\xeb\xc41\xc6\xd3\xc7\x89\x08\xac\x1cD\xf2\xf8k\xef\xa5\n\
+\xb9{\x17p^\xa7\x8f\xaaz\xb6\xc8\xbb\x80\xc7\xcc9\'\x16;\x06\x8a\x7f\xc9\xa4\
+B\xfb\x8eZ\x9a\x1c\xcdD]3E\xa5,5\xfbp\xed\x1e4@\x034\xc0\x9f\x00p\xb8\x0f\
+\xea\xdf\xeaLD\x04\xb8<\x96\x9f\x01\x00\x0061\x7fC\x13\xc3%n\xfb\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 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 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 getToolStaticTextBitmap():
-    return wxBitmapFromImage(getToolStaticTextImage())
+def getToolSliderBitmap():
+    return wxBitmapFromImage(getToolSliderImage())

 
 

-def getToolStaticTextImage():
-    stream = cStringIO.StringIO(getToolStaticTextData())
+def getToolSliderImage():
+    stream = cStringIO.StringIO(getToolSliderData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolStaticTextIcon():
+def getToolSliderIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolStaticTextBitmap())
+    icon.CopyFromBitmap(getToolSliderBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolTextCtrlData():
+def getUndoData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x17\x00\x00\x00\x16\x08\x06\
+\x00\x00\x00+v\x07\x05\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xaeIDATx\x9c\xed\x941\x0e\xc2 \x18\x85\xbf\x1f:tt\xf4\x08\x1e\xc0\x03x\
+\x0c\x8f\xe1\xe8\xe8\xe8\xd8#98\xf6 \x8c\x8e\x0c\xb48\x986F\xb1\x10*I\x87\
+\xbe\x84\xe5\x05\xbe\x97\xfc<\x10Q\x9aRR\xc5\xc8+<\x1b\xee\xfb\xce\x17\x81\
+\xcf\x01\x03TS\xe0\xeba\x8bup\xb9\x9b1D\x94\x96T\xb8\x84z>\x80\xeb\xaa\xc6:\
+\x0b\x80u\xf0\xb0\xd0\xb4&9$\x08\x7f\x0f\x008\xdf\xcc\xe8\x9f\xf6/\xafiM<@\
+\x94\xfe\xb9\x00\x0f\xf8O\xef\xb8\xdb|\xf9\xc1\xf3\xd1\r\x01Hr@\xee\xdf24ij4\
+\xcb}\xa1\xb1\x0b\xcd\x82\xfb\xbe\xf3\xb3\xaa\xf8\x0f-w\xe6+<KO\xe35=1aE\xd2\
++\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolTextCtrlBitmap():
-    return wxBitmapFromImage(getToolTextCtrlImage())
+def getUndoBitmap():
+    return wxBitmapFromImage(getUndoImage())

 
 

-def getToolTextCtrlImage():
-    stream = cStringIO.StringIO(getToolTextCtrlData())
+def getUndoImage():
+    stream = cStringIO.StringIO(getUndoData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolTextCtrlIcon():
+def getUndoIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolTextCtrlBitmap())
+    icon.CopyFromBitmap(getUndoBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -1087,505 +1251,432 @@ def getToolButtonIcon():
     return icon
 
 #----------------------------------------------------------------------
     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():
+def getToolMenuBarData():

     return \
     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' 
+'\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\x00aIDATx\x9c\xed\x93\xb1\r\x800\x0c\x04\xcf!E\xc6\xca\x98\x19\xc7cx\
+\x94\x14HP "7)\x88\x0b(\xb8\xf2\xa5\x7f\xbdmY$mDH!\xf7\'\x02\xa4\xef\xfdX5\
+\x97\\\xc8\x00f\xf6\xd8\xac\xaa\x00W\x80\x17<\xb5\xd6\xa9~\xf3\xfe\x12\xc7\
+\x08\xbe\x96g\xa6\x8f\x80\xd6Z\xa8\x81\x00\xcbg\x04\x90\xff\x178\x01o\x9c\
+\x13?\x15\xa3\xaau\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolRadioButtonBitmap():
-    return wxBitmapFromImage(getToolRadioButtonImage())
+def getToolMenuBarBitmap():
+    return wxBitmapFromImage(getToolMenuBarImage())

 
 

-def getToolRadioButtonImage():
-    stream = cStringIO.StringIO(getToolRadioButtonData())
+def getToolMenuBarImage():
+    stream = cStringIO.StringIO(getToolMenuBarData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolRadioButtonIcon():
+def getToolMenuBarIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolRadioButtonBitmap())
+    icon.CopyFromBitmap(getToolMenuBarBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolSpinButtonData():
+def getTreeSeparatorData():

     return \
     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' 
+'\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\x9ccddbf\xa0\x040Q\xa4{\xd4\x00\x06\x06\x06\x06\x06\x16\x18\xa3\
+\x7fR\xef\x7fb5edd0p\xb2q3\xa2\x18\x00\x93 \x150\x8e\xa6\x83A`\x00\x00/$\x05\
+c\xe7\xe7\x1e{\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolSpinButtonBitmap():
-    return wxBitmapFromImage(getToolSpinButtonImage())
+def getTreeSeparatorBitmap():
+    return wxBitmapFromImage(getTreeSeparatorImage())

 
 

-def getToolSpinButtonImage():
-    stream = cStringIO.StringIO(getToolSpinButtonData())
+def getTreeSeparatorImage():
+    stream = cStringIO.StringIO(getTreeSeparatorData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolSpinButtonIcon():
+def getTreeSeparatorIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolSpinButtonBitmap())
+    icon.CopyFromBitmap(getTreeSeparatorBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolStaticBoxData():
+def getToolBoxSizerData():

     return \
     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' 
+'\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\x00CIDATx\x9ccddbf\xa0\x040Q\xa4\x9b\x1a\x06\xb00000\xc4\'\xc5\xfe\'\
+\xdb\x04F&f\x86\x84\x94\x84\xff\x8cL\xcc\x0c\xd80!\xb9\x81\x0f\x83Q\x03\xa8`\
+\x00##\x133E\t\x89q\xe8g&\x00\xf6\x1a\x0b!\xd5\xcf\xe1\x80\x00\x00\x00\x00IE\
+ND\xaeB`\x82' 

 
 

-def getToolStaticBoxBitmap():
-    return wxBitmapFromImage(getToolStaticBoxImage())
+def getToolBoxSizerBitmap():
+    return wxBitmapFromImage(getToolBoxSizerImage())

 
 

-def getToolStaticBoxImage():
-    stream = cStringIO.StringIO(getToolStaticBoxData())
+def getToolBoxSizerImage():
+    stream = cStringIO.StringIO(getToolBoxSizerData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolStaticBoxIcon():
+def getToolBoxSizerIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolStaticBoxBitmap())
+    icon.CopyFromBitmap(getToolBoxSizerBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolRadioBoxData():
+def getToolSpinCtrlData():

     return \
     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' 
+'\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\xe2IDATx\x9c\xb5TA\n\x830\x10\x9c\x8d"\x8a\x1f\xf1\x19>\xa8\x14K\
+\xdfQ\x1a\x8a\x0f\xf2\x19\xf9\x88\x18D\xdd\x1e\xdaH\r\x89\x8d\xd6\x0e\xecew3\
+\x93\xcc&!YK\xc6\x0e\\\xceW\nj|\x0bl\n=h&\x11\xc1\x0eW>6Bz\xd0A\x1bRJ9\xf3]\
+\xdf\xb2R\n<\x8dL"\x9aO\'\x82X\xbf\xc0\x90\x03\x80\xac%x\x1ag\xdb\xbd\x02i\
+\x9cn&\x07\x80\xb2,\x17"\xb1kQ(\xb9A\xd34\xde\x9aS@\x0f:H\xa4\xeb[^\xeb\xe3i\
+d\xa7@(\xb2$\'\x12\xd1j\xcf!C\xfe\x9b@\xd7\xb7\xec\x8b\xfb\xe3\xc6\x87Xd\xdf\
+"\xe05\xf4\xeaT\x81DD?[\x94%9\x15E\xb1\xc8\x19r`\xc5\xa2\xd0\x97m\xc3\xbe\
+\xb2\x87\x0c\xd9\x9c\xe2\xd3\x1aS\x9bg\xe0\xfbc\xb6\x88\xd8\xff\xd0,\xb0\xd7\
+\x0e\x1b69\x00<\x01=?\x92\x07L\xf8\x9b\xfd\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolRadioBoxBitmap():
-    return wxBitmapFromImage(getToolRadioBoxImage())
+def getToolSpinCtrlBitmap():
+    return wxBitmapFromImage(getToolSpinCtrlImage())

 
 

-def getToolRadioBoxImage():
-    stream = cStringIO.StringIO(getToolRadioBoxData())
+def getToolSpinCtrlImage():
+    stream = cStringIO.StringIO(getToolSpinCtrlData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolRadioBoxIcon():
+def getToolSpinCtrlIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolRadioBoxBitmap())
+    icon.CopyFromBitmap(getToolSpinCtrlBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolComboBoxData():
+def getToolGaugeData():

     return \
     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' 
+'\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 getToolComboBoxBitmap():
-    return wxBitmapFromImage(getToolComboBoxImage())
+def getToolGaugeBitmap():
+    return wxBitmapFromImage(getToolGaugeImage())

 
 

-def getToolComboBoxImage():
-    stream = cStringIO.StringIO(getToolComboBoxData())
+def getToolGaugeImage():
+    stream = cStringIO.StringIO(getToolGaugeData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolComboBoxIcon():
+def getToolGaugeIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolComboBoxBitmap())
+    icon.CopyFromBitmap(getToolGaugeBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolListBoxData():
+def getToolStaticBoxSizerData():

     return \
     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' 
+'\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\x9c\xed\x92\xd1\n\x800\x08E\xbd\xdao\x8e\xc9\xd8w\x05\xd1w.{\
+\xe9a\xad\xa8\xad\x05\xbdt@\x04\x85\x83\\\x04X\xa8\x07.\x07\xb6${,\xb0%\x19X\
+\xd0"\x19\x88\x88|p6\x8d3\xca\x0b|p\xf7"\xb0\x90F\xb5-\x8b]\xcfwg\xa5Q\x8d\
+\x0b\x19\xf2^\xc3!\xc4V~\xc1\x0b\x02\x80\xa5\xeea\xae\x04=|\x9f\xc1\n5\x8d!\
+\x0c\xe9\x92\xca\xdd\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolListBoxBitmap():
-    return wxBitmapFromImage(getToolListBoxImage())
+def getToolStaticBoxSizerBitmap():
+    return wxBitmapFromImage(getToolStaticBoxSizerImage())

 
 

-def getToolListBoxImage():
-    stream = cStringIO.StringIO(getToolListBoxData())
+def getToolStaticBoxSizerImage():
+    stream = cStringIO.StringIO(getToolStaticBoxSizerData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolListBoxIcon():
+def getToolStaticBoxSizerIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolListBoxBitmap())
+    icon.CopyFromBitmap(getToolStaticBoxSizerBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolStaticLineData():
+def getToolNotebookData():

     return \
     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' 
+'\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\xd6IDATx\x9c\xed\x961\x0e\x830\x0cE\x7f \xaa\xa8z\x11\x86\x0e\x1c!Gg\
+\xe8\x90\x91\xa1C.\x82@\xa8m:\xa5JBB\xedTt\xa8\xfa6;V\xbe\xbf1\x08!\xaa\x1a\
+\xd32Z\x108\x1eN\x82R\xe7#\xa7e\xb4\xc6\x18R\xb1}\xdc\xad\xa8j\x96\x88L%\xbb\
+s\x87\xe1:\x04\xb9\xbe\xef\x01\xe0\xad\xdb\xd8eR`\x0b}\xd1\x9b\xe7\xb1\xcb\
+\x95\x80\xeb>\xe5\xc2\xa1\x94\nb\xe7N\xeb\xb58\xdbA|\xa9\x13\xf4c\x9f\xca\
+\x0f\xfc\xae\x9d\x8bOI\x8e\x88\x82?\xa6\\\xf7\x81@n\xe6\xb9|\xd1\x88\xf6\xe0\
+%\x90\xdb\x98\\\x9eJ\xf1\x16\xb1\x9f\x01\x87\xad\x0bc\xc4|\x9b\xc9\xdf"\x00h\
+\xdb\x96\\\xdb\xc8\x86\xef\x80\xd3\x0c\xb0\xe3\x16\xb91~oM\xff\x02\xbf+ \x01\
+\xde\x9b\xc9E\x00 \xfd\xb2\x94\xf2\x04\x8e(\\\xddC\x93]3\x00\x00\x00\x00IEND\
+\xaeB`\x82' 

 
 

-def getToolStaticLineBitmap():
-    return wxBitmapFromImage(getToolStaticLineImage())
+def getToolNotebookBitmap():
+    return wxBitmapFromImage(getToolNotebookImage())

 
 

-def getToolStaticLineImage():
-    stream = cStringIO.StringIO(getToolStaticLineData())
+def getToolNotebookImage():
+    stream = cStringIO.StringIO(getToolNotebookData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolStaticLineIcon():
+def getToolNotebookIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolStaticLineBitmap())
+    icon.CopyFromBitmap(getToolNotebookBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolStaticBitmapData():
+def getTreeSizerGridBagData():

     return \
     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'\
- 
+'\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\x00SIDATx\x9ccddbf\x88O\x8a\xfd\xcf@&`\x811\x16\xce[\xccH\xaa\xe6\xf8\
+\xa4\xd8\xffL\xe4\xda\x0c\x03\x03o\x00<\x0c\xc8\x0eHF&f\x86\x84\x94\x84\xff\
+\x8cL\xcc\x0c\xc8\x18\x9b\x1865\x03\x1f\x06\xa3\x06P\xc1\x00FJs###\x133E.\
+\x00\x00\x9f\x06\x11@\xf1\x14Nh\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolStaticBitmapBitmap():
-    return wxBitmapFromImage(getToolStaticBitmapImage())
+def getTreeSizerGridBagBitmap():
+    return wxBitmapFromImage(getTreeSizerGridBagImage())

 
 

-def getToolStaticBitmapImage():
-    stream = cStringIO.StringIO(getToolStaticBitmapData())
+def getTreeSizerGridBagImage():
+    stream = cStringIO.StringIO(getTreeSizerGridBagData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolStaticBitmapIcon():
+def getTreeSizerGridBagIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolStaticBitmapBitmap())
+    icon.CopyFromBitmap(getTreeSizerGridBagBitmap())

     return icon
 
 #----------------------------------------------------------------------
     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 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\x19IDATx\x9c\xc5\x94\xb1n\x830\x10\x86\xff#\x08\t\xb1d\xc8\xc30\xe4\
+\x81<f\xe8@\xdb9\xe9T%\xaa:\xf0@\x1d2f\xe8cd`A \x14\xb8L\x87\x8ccLk\xa8z\x92\
+%\x0c\xbe\xef\xf3Y\x87\x89\x82\x15\\\xc1]\xcb\x14\xac\xc8\xb9\xc8\x11\x81o\
+\xe2"\x02\xd9=w-\xfb\n\xc2\xe3\xc7\xfb Y)\x858J\x9cGR5%\xe7y>\tWJ!\x94\x07\t\
+\x81\xebg/U\xc8<\x8e\x12\xaa\x9a\xf2GU\xf5G\x14G\t\x99;\xe7\xaee\x19f\xa2\
+\xac\x1f\x1bRah\xb3\x8eu\x8eOG\xfdO\x17\xe9\xbb|;\xec\xd9\xf6~\x96\xc0\x84\
+\xeb\x92\xc5\x04\x02\xcd\xb2l0_D\xa0\xc3/\xdf\x97Y\x92\x07\x81\t\x070K2\x10\
+\xd8\xe0\x12\xbe\x92\xc1\x7f\xf0\xfc\xf2JUS\xf2\xeei\x87\xf3\xd7\x19\xeb\xcd\
+\xba\xffV\\\x0b\xd4\xb7\x1a\x00&\xaf\x92\xd1\n\xf4\xe4t\x9b\xa2\xb8\x16=<\
+\xdd\xa6\xbf\x86[\x056\x89/|T`J|\xe1N\x81\x0e\xf5\x85O\n\xe6\xc2\x01\x80N\
+\x9f\'\xefk`*\x94R\xa0\xfaV\xff\x99\x00\x00\xee\nk\x91"\xbf\xf2\r\x0c\x00\
+\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolSliderBitmap():
-    return wxBitmapFromImage(getToolSliderImage())
+def getToolRadioBoxBitmap():
+    return wxBitmapFromImage(getToolRadioBoxImage())

 
 

-def getToolSliderImage():
-    stream = cStringIO.StringIO(getToolSliderData())
+def getToolRadioBoxImage():
+    stream = cStringIO.StringIO(getToolRadioBoxData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolSliderIcon():
+def getToolRadioBoxIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolSliderBitmap())
+    icon.CopyFromBitmap(getToolRadioBoxBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolGaugeData():
+def getNewData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00uIDATx\x9c\xed\xd5\xc1\n\xc0 \x08\x06\xe0_\xeb\xe0\xcbo{]\x0f\x95;\xb5S\
+\xabX\xc4\x18K\xe8\x92\xd0G\xa2E\xc4\x0e3\x83\xa7\x9e\xbe\x80\x9e\xf0\xb5\
+\xa4\xa5h\xb5<\xb1\xa3!\x00\x004hq_\xbc\xc0R\xb4\x162T"\r\xda\xbc\xe5\x10 ^\
+\x00\xd4K\xf9\x18\xd0\xa0\xd7\x02\x80c\xdf\x8a\xc8\xf7\xdbt\x01?\x00\x9aOE\
+\x1e\xa6)\x00\xb1\xa3\xbb\x01\xea\rZ_\xe6\xeb\xc0\tP=$d\x0e\x7f\xfbW\x00\x00\
+\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolGaugeBitmap():
-    return wxBitmapFromImage(getToolGaugeImage())
+def getNewBitmap():
+    return wxBitmapFromImage(getNewImage())

 
 

-def getToolGaugeImage():
-    stream = cStringIO.StringIO(getToolGaugeData())
+def getNewImage():
+    stream = cStringIO.StringIO(getNewData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolGaugeIcon():
+def getNewIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolGaugeBitmap())
+    icon.CopyFromBitmap(getNewBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolScrollBarData():
+def getTreeSizerFlexGridData():

     return \
     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' 
+'\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\x9ccddbf\x88O\x8a\xfd\xcf@.`dbfHHI\xf8\xcf\xc8\xc4\xcc\x80\
+\x8c\xb1\x89aS\xc3D\xb6\xcdP0\xf0\x060\x8e\x06\xe2\xa8\x01\xd40\x80\xe2\x84\
+\xc4\xc8\xc8\xc4L\x91\x0b\x00\xb7J\x13\xf6R\x88\'\x0b\x00\x00\x00\x00IEND\
+\xaeB`\x82' 

 
 

-def getToolScrollBarBitmap():
-    return wxBitmapFromImage(getToolScrollBarImage())
+def getTreeSizerFlexGridBitmap():
+    return wxBitmapFromImage(getTreeSizerFlexGridImage())

 
 

-def getToolScrollBarImage():
-    stream = cStringIO.StringIO(getToolScrollBarData())
+def getTreeSizerFlexGridImage():
+    stream = cStringIO.StringIO(getTreeSizerFlexGridData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolScrollBarIcon():
+def getTreeSizerFlexGridIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolScrollBarBitmap())
+    icon.CopyFromBitmap(getTreeSizerFlexGridBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolTreeCtrlData():
+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\
     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' 
+\x00fIDATx\x9ccddbf\xa0\x040Q\xa4\x9b\x1a\x06\xb0\xa0\x0b|\xff\xf5\xf5?>\r\
+\x1c,\x1c\x0c\x8cL\xcc\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\xda\
+\xb8\x00#zR\xfe\xff\xef/\xdet\xc0\xc0\xc0\x80\x92\x0e0\x0c \x15P\x1c\x88\x00\
+4\x07\x12\xfe0\x81\xfe\x92\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolTreeCtrlBitmap():
-    return wxBitmapFromImage(getToolTreeCtrlImage())
+def getTreeToolBitmap():
+    return wxBitmapFromImage(getTreeToolImage())

 
 

-def getToolTreeCtrlImage():
-    stream = cStringIO.StringIO(getToolTreeCtrlData())
+def getTreeToolImage():
+    stream = cStringIO.StringIO(getTreeToolData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolTreeCtrlIcon():
+def getTreeToolIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolTreeCtrlBitmap())
+    icon.CopyFromBitmap(getTreeToolBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolListCtrlData():
+def getTreeDefaultData():

     return \
     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' 
+'\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\x9c\xc5\x92Q\n\xc00\x08C\x13\xdb\x8f\xde\xffD\x1e\xc3\x8b\x8c\
+\xc1`\xeb\xfek\x1d\x0c\x0b\xcdg\xd0\x07&\x92R\x90\x91\xa4\xb6W\x00\xeah\x9c\
+\xd7\xd1\xa3\xe1V\x1b(\x85\x9f\x00\x0003\xe7\xa9\xea\x14\xba?\x83\xf5!\x02\
+\xf1\xbd3q|\xa4\xfe\xdca\x0b\x00\\\x0b\x0e\xf0W\xfbCL\x03^\xd7\x11\x0f:g|b\
+\x05\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolListCtrlBitmap():
-    return wxBitmapFromImage(getToolListCtrlImage())
+def getTreeDefaultBitmap():
+    return wxBitmapFromImage(getTreeDefaultImage())

 
 

-def getToolListCtrlImage():
-    stream = cStringIO.StringIO(getToolListCtrlData())
+def getTreeDefaultImage():
+    stream = cStringIO.StringIO(getTreeDefaultData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolListCtrlIcon():
+def getTreeDefaultIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolListCtrlBitmap())
+    icon.CopyFromBitmap(getTreeDefaultBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolCheckListData():
+def getTreeSizerHData():

     return \
     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' 
+'\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\x00CIDATx\x9ccddbf\xa0\x040Q\xa4\x9b\x1a\x06\xb00000\xc4\'\xc5\xfe\'\
+\xdb\x04F&f\x86\x84\x94\x84\xff\x8cL\xcc\x0c\xd80!\xb9\x81\x0f\x83Q\x03\xa8`\
+\x00##\x133E\t\x89q\xe8g&\x00\xf6\x1a\x0b!\xd5\xcf\xe1\x80\x00\x00\x00\x00IE\
+ND\xaeB`\x82' 

 
 

-def getToolCheckListBitmap():
-    return wxBitmapFromImage(getToolCheckListImage())
+def getTreeSizerHBitmap():
+    return wxBitmapFromImage(getTreeSizerHImage())

 
 

-def getToolCheckListImage():
-    stream = cStringIO.StringIO(getToolCheckListData())
+def getTreeSizerHImage():
+    stream = cStringIO.StringIO(getTreeSizerHData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolCheckListIcon():
+def getTreeSizerHIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolCheckListBitmap())
+    icon.CopyFromBitmap(getTreeSizerHBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolNotebookData():
+def getPasteData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\xddIDATx\x9c\xed\x95\xbb\x0e\xc3 \x0cE\xaf\t\x03\x9f\x9b\xb6KG\x8fY\xda\
+\xfejG\x06\x12:T\xa4\x04L\x83\x920T\xaa\xa5(\x18\xc1=\xc6\xe6A\xa4:\xb44\xd5\
+T\xfd\x0f\xa81];\xd0O\xa3\x8f}R\x1d\xd5\xcc\xa3\xd2.J\x05\x01\xc0\xba\xf7\
+\xdf\x08a\x95\x80\xe2\n\xfc4zf\x9e}f\x86u\x1f\xe1\xd0N\xc6x\t\xb2Z\x83 \x1e\
+\x84\xe3v\x0c\x00\x80\xc7\xfd\x96\xad\xba\xaa\x06RJjmuj\x1a\xe5\xe1\x80%\xac\
+1\x00\x00\xac\xbbf}F\x0f\x00d\xfa\x8e\xec\xe6`\xa3\x07P\xb2m6\x9dd\xa3\x87\
+\xf9\x8b\xfb\x80|\'mZA\x9a\xa6\xe0\xc7\xc0]\x00IH\xaaM\x11@\xaa#f\xce\x0eM(d\
+I\xac\x1a\x10 i>\xfb\xfe)F\xbf\t\x00\x00\xa7\xf3eq\xb7\x90\x92\xaf\x83oV\xbc\
+M\x8f\xb2\xdf\x7f\xd1^\xd8\x83K\xcb \xf2\xd0I\x00\x00\x00\x00IEND\xaeB`\x82'\
+ 

 
 

-def getToolNotebookBitmap():
-    return wxBitmapFromImage(getToolNotebookImage())
+def getPasteBitmap():
+    return wxBitmapFromImage(getPasteImage())

 
 

-def getToolNotebookImage():
-    stream = cStringIO.StringIO(getToolNotebookData())
+def getPasteImage():
+    stream = cStringIO.StringIO(getPasteData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolNotebookIcon():
+def getPasteIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolNotebookBitmap())
+    icon.CopyFromBitmap(getPasteBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolSpinCtrlData():
+def getSaveData():

     return \
     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' 
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x18\x00\x00\x00\x17\x08\x06\
+\x00\x00\x00\x11!\x8f-\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\
+\x00\x8bIDATx\x9c\xed\x95\xd1\n\x80 \x0cE\xb7\xe9C\x9f\xed\x0fT~\xae\x0f\x95\
+=\x84 6W\x86\x12F\x17\x860\xe4\x1e\xa7S\x11IAKQS\xf7O\x004\x97\xf4\xdb\xea\
+\x9f\x98!)Ls\xd9\n\x8c9F\xb781\xe2\xb9\xf34\x9e\x16Ve\x8b\x02\x80S\x1f\x00I\
+\xfd\x03\xd86\r2\x06`\xd0\x83h \xed\xff%\xe0\x8e\xc1\x95\xaa\x00\x9atQ|\xd1$\
+\xf5\xdfE\x80\xa4\xd8\x00\x00_\x1a\xd6Z\x9f\xfad\x0f\x19I!\xf7x\x15\x17\xf0\
+\x7f\x99\xaf\x03v~a?\xc4E\xc5\x7ff\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolSpinCtrlBitmap():
-    return wxBitmapFromImage(getToolSpinCtrlImage())
+def getSaveBitmap():
+    return wxBitmapFromImage(getSaveImage())

 
 

-def getToolSpinCtrlImage():
-    stream = cStringIO.StringIO(getToolSpinCtrlData())
+def getSaveImage():
+    stream = cStringIO.StringIO(getSaveData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolSpinCtrlIcon():
+def getSaveIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolSpinCtrlBitmap())
+    icon.CopyFromBitmap(getSaveBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolUnknownData():
+def getTreeSizerVData():

     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\
     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' 
+\x00\x00?IDATx\x9ccddbf@\x06\xf1I\xb1\xff\x19\x08\x80\x85\xf3\x163\xc2\xd8,\
+\x84\x14\xa0\x03t\x0b\x98\x08\xd9F\x08\x8c\x1a\x80#\x16\x88\x89J\xbc\x06\x8c\
+F#\x9d\r\xa08\x1a\x19\xd1\xb33\xa9\x00\x00\xdc)\x10m8\xd9\x85\x8e\x00\x00\
+\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolUnknownBitmap():
-    return wxBitmapFromImage(getToolUnknownImage())
+def getTreeSizerVBitmap():
+    return wxBitmapFromImage(getTreeSizerVImage())

 
 

-def getToolUnknownImage():
-    stream = cStringIO.StringIO(getToolUnknownData())
+def getTreeSizerVImage():
+    stream = cStringIO.StringIO(getTreeSizerVData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolUnknownIcon():
+def getTreeSizerVIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolUnknownBitmap())
+    icon.CopyFromBitmap(getTreeSizerVBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------

-def getToolBoxSizerData():
+def getToolGridBagSizerData():

     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\
     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' 
+\x00\x00SIDATx\x9ccddbf\x88O\x8a\xfd\xcf@&`\x811\x16\xce[\xccH\xaa\xe6\xf8\
+\xa4\xd8\xffL\xe4\xda\x0c\x03\x03o\x00<\x0c\xc8\x0eHF&f\x86\x84\x94\x84\xff\
+\x8cL\xcc\x0c\xc8\x18\x9b\x1865\x03\x1f\x06\xa3\x06P\xc1\x00FJs###\x133E.\
+\x00\x00\x9f\x06\x11@\xf1\x14Nh\x00\x00\x00\x00IEND\xaeB`\x82' 

 
 

-def getToolBoxSizerBitmap():
-    return wxBitmapFromImage(getToolBoxSizerImage())
+def getToolGridBagSizerBitmap():
+    return wxBitmapFromImage(getToolGridBagSizerImage())

 
 

-def getToolBoxSizerImage():
-    stream = cStringIO.StringIO(getToolBoxSizerData())
+def getToolGridBagSizerImage():
+    stream = cStringIO.StringIO(getToolGridBagSizerData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getToolBoxSizerIcon():
+def getToolGridBagSizerIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getToolBoxSizerBitmap())
+    icon.CopyFromBitmap(getToolGridBagSizerBitmap())

     return icon
 
 #----------------------------------------------------------------------
     return icon
 
 #----------------------------------------------------------------------


@@ -1609,67 +1700,24 @@ def getToolSeparatorIcon():
     return icon
 
 #----------------------------------------------------------------------
     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():
+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\
     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' 
+\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 getTreeSeparatorBitmap():
-    return wxBitmapFromImage(getTreeSeparatorImage())
+def getToolPanelBitmap():
+    return wxBitmapFromImage(getToolPanelImage())

 
 

-def getTreeSeparatorImage():
-    stream = cStringIO.StringIO(getTreeSeparatorData())
+def getToolPanelImage():
+    stream = cStringIO.StringIO(getToolPanelData())

     return wxImageFromStream(stream)
 
     return wxImageFromStream(stream)
 

-def getTreeSeparatorIcon():
+def getToolPanelIcon():

     icon = wxEmptyIcon()
     icon = wxEmptyIcon()

-    icon.CopyFromBitmap(getTreeSeparatorBitmap())
+    icon.CopyFromBitmap(getToolPanelBitmap())

     return icon
 
     return icon
 

diff --git a/wxPython/wx/tools/XRCed/panel.py b/wxPython/wx/tools/XRCed/panel.py
index 55330fa01a40024518d55f3edf3605cde7bbcb02..5fbefc2427421c1806867e21fb8bb8b80bd026c1 100644 (file)
--- a/wxPython/wx/tools/XRCed/panel.py
+++ b/wxPython/wx/tools/XRCed/panel.py
@@ -87,13 +87,16 @@ class Panel(wxNotebook):
                     sizer.Add(wxStaticText(self.page1, -1, 'Select a tree item.'))
         else:
             g.currentXXX = xxx.treeObject()
                     sizer.Add(wxStaticText(self.page1, -1, 'Select a tree item.'))
         else:
             g.currentXXX = xxx.treeObject()

+            # Normal or SizerItem page
+            isGBSizerItem = isinstance(xxx.parent, xxxGridBagSizer)
+            cacheID = (xxx.__class__, isGBSizerItem)            

             try:
             try:

-                page = self.pageCache[xxx.__class__]
+                page = self.pageCache[cacheID]

                 page.box.SetLabel(xxx.panelName())
                 page.Reparent(self.page1)
             except KeyError:
                 page = PropPage(self.page1, xxx.panelName(), xxx)
                 page.box.SetLabel(xxx.panelName())
                 page.Reparent(self.page1)
             except KeyError:
                 page = PropPage(self.page1, xxx.panelName(), xxx)

-                self.pageCache[xxx.__class__] = page
+                self.pageCache[cacheID] = page

             page.SetValues(xxx)
             self.pages.append(page)
             sizer.Add(page, 1, wxEXPAND)
             page.SetValues(xxx)
             self.pages.append(page)
             sizer.Add(page, 1, wxEXPAND)

diff --git a/wxPython/wx/tools/XRCed/params.py b/wxPython/wx/tools/XRCed/params.py
index dfb34de69e828789add26609e16eac207cd9c564..d15bf69641ce3213c6515e91f76ae8207f01571d 100644 (file)
--- a/wxPython/wx/tools/XRCed/params.py
+++ b/wxPython/wx/tools/XRCed/params.py
@@ -60,9 +60,9 @@ class ParamBinaryOr(PPanel):
         self.text.SetValue(value)
         self.freeze = False
     def OnButtonChoices(self, evt):
         self.text.SetValue(value)
         self.freeze = False
     def OnButtonChoices(self, evt):

-        dlg = wxDialog(self, -1, 'Choices')
-        topSizer = wxBoxSizer(wxVERTICAL)
-        listBox = wxCheckListBox(dlg, -1, choices=self.values, size=(250,200))
+        dlg = g.frame.res.LoadDialog(self, 'DIALOG_CHOICES')
+        listBox = XRCCTRL(dlg, 'CHECK_LIST')
+        listBox.InsertItems(self.values, 0)

         value = map(string.strip, self.text.GetValue().split('|'))
         if value == ['']: value = []
         ignored = []
         value = map(string.strip, self.text.GetValue().split('|'))
         if value == ['']: value = []
         ignored = []


@@ -76,18 +76,6 @@ class ParamBinaryOr(PPanel):
                 else:
                     print 'WARNING: unknown flag: %s: ignored.' % i
                     ignored.append(i)
                 else:
                     print 'WARNING: unknown flag: %s: ignored.' % i
                     ignored.append(i)

-        topSizer.Add(listBox, 1, wxEXPAND)
-        sizer = wxBoxSizer()
-        buttonOk = wxButton(dlg, wxID_OK, 'OK')
-        buttonOk.SetDefault()
-        sizer.Add(buttonOk, 0, wxRIGHT, 10)
-        sizer.Add((0, 0), 1)
-        sizer.Add(wxButton(dlg, wxID_CANCEL, 'Cancel'))
-        topSizer.Add(sizer, 0, wxALL | wxEXPAND, 10)
-        dlg.SetAutoLayout(True)
-        dlg.SetSizer(topSizer)
-        topSizer.Fit(dlg)
-        dlg.Center()

         if dlg.ShowModal() == wxID_OK:
             value = []
             for i in range(listBox.GetCount()):
         if dlg.ShowModal() == wxID_OK:
             value = []
             for i in range(listBox.GetCount()):


@@ -350,20 +338,6 @@ class ParamUnit(PPanel):
     def OnSpinDown(self, evt):
         self.Change(-1)
 
     def OnSpinDown(self, evt):
         self.Change(-1)
 

-# Dialog for editing multi-line text
-class TextDialog(wxDialog):
-    def __init__(self, parent, value):
-       pre = wxPreDialog()
-        g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_TEXT')
-        self.this = pre.this
-       self._setOORInfo(self)
-        self.text = self.FindWindowByName('TEXT')
-        self.text.SetValue(value)
-        self.SetAutoLayout(True)
-        self.SetSize((300,200))
-    def GetValue(self):
-        return self.text.GetValue()
-

 class ParamMultilineText(PPanel):
     def __init__(self, parent, name, textWidth=-1):
         PPanel.__init__(self, parent, name)
 class ParamMultilineText(PPanel):
     def __init__(self, parent, name, textWidth=-1):
         PPanel.__init__(self, parent, name)


@@ -388,9 +362,11 @@ class ParamMultilineText(PPanel):
         self.text.SetValue(value)
         self.freeze = False             # disable other handlers
     def OnButtonEdit(self, evt):
         self.text.SetValue(value)
         self.freeze = False             # disable other handlers
     def OnButtonEdit(self, evt):

-        dlg = TextDialog(self, self.text.GetValue())
+        dlg = g.frame.res.LoadDialog(self, 'DIALOG_TEXT')
+        textCtrl = XRCCTRL(dlg, 'TEXT')
+        textCtrl.SetValue(self.text.GetValue())

         if dlg.ShowModal() == wxID_OK:
         if dlg.ShowModal() == wxID_OK:

-            self.text.SetValue(dlg.GetValue())
+            self.text.SetValue(textCtrl.GetValue())

             self.SetModified()
         dlg.Destroy()
 
             self.SetModified()
         dlg.Destroy()
 


@@ -439,7 +415,7 @@ class ContentDialog(wxDialog):
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
         self.this = pre.this
        self._setOORInfo(self)
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT')
         self.this = pre.this
        self._setOORInfo(self)

-        self.list = self.FindWindowByName('LIST')
+        self.list = XRCCTRL(self, 'LIST')

         # Set list items
         for v in value:
             self.list.Append(v)
         # Set list items
         for v in value:
             self.list.Append(v)


@@ -489,7 +465,7 @@ class ContentCheckListDialog(wxDialog):
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
         self.this = pre.this
        self._setOORInfo(self)
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_CONTENT_CHECK_LIST')
         self.this = pre.this
        self._setOORInfo(self)

-        self.list = self.FindWindowByName('CHECK_LIST')
+        self.list = XRCCTRL(self, 'CHECK_LIST')

         # Set list items
         i = 0
         for v,ch in value:
         # Set list items
         i = 0
         for v,ch in value:


@@ -622,7 +598,7 @@ class IntListDialog(wxDialog):
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
         self.this = pre.this
        self._setOORInfo(self)
         g.frame.res.LoadOnDialog(pre, parent, 'DIALOG_INTLIST')
         self.this = pre.this
        self._setOORInfo(self)

-        self.list = self.FindWindowByName('LIST')
+        self.list = XRCCTRL(self, 'LIST')

         # Set list items
         value.sort()
         for v in value:
         # Set list items
         value.sort()
         for v in value:


@@ -718,7 +694,7 @@ class ParamBool(RadioBox):
     values = {'yes': '1', 'no': '0'}
     seulav = {'1': 'yes', '0': 'no'}
     def __init__(self, parent, name):
     values = {'yes': '1', 'no': '0'}
     seulav = {'1': 'yes', '0': 'no'}
     def __init__(self, parent, name):

-        RadioBox.__init__(self, parent, -1, choices = self.values.keys(), name=name)
+        RadioBox.__init__(self, parent, -1, choices=self.values.keys(), name=name)

     def GetValue(self):
         return self.values[self.GetStringSelection()]
     def SetValue(self, value):
     def GetValue(self):
         return self.values[self.GetStringSelection()]
     def SetValue(self, value):


@@ -729,7 +705,7 @@ class ParamOrient(RadioBox):
     values = {'horizontal': 'wxHORIZONTAL', 'vertical': 'wxVERTICAL'}
     seulav = {'wxHORIZONTAL': 'horizontal', 'wxVERTICAL': 'vertical'}
     def __init__(self, parent, name):
     values = {'horizontal': 'wxHORIZONTAL', 'vertical': 'wxVERTICAL'}
     seulav = {'wxHORIZONTAL': 'horizontal', 'wxVERTICAL': 'vertical'}
     def __init__(self, parent, name):

-        RadioBox.__init__(self, parent, -1, choices = self.values.keys(), name=name)
+        RadioBox.__init__(self, parent, -1, choices=self.values.keys(), name=name)

     def GetValue(self):
         return self.values[self.GetStringSelection()]
     def SetValue(self, value):
     def GetValue(self):
         return self.values[self.GetStringSelection()]
     def SetValue(self, value):


@@ -791,11 +767,11 @@ class ParamBitmap(PPanel):
        self._setOORInfo(self)
         self.modified = self.freeze = False
         self.SetBackgroundColour(g.panel.GetBackgroundColour())
        self._setOORInfo(self)
         self.modified = self.freeze = False
         self.SetBackgroundColour(g.panel.GetBackgroundColour())

-        self.radio_std = self.FindWindowByName('RADIO_STD')
-        self.radio_file = self.FindWindowByName('RADIO_FILE')
-        self.combo = self.FindWindowByName('COMBO_STD')
-        self.text = self.FindWindowByName('TEXT_FILE')
-        self.button = self.FindWindowByName('BUTTON_BROWSE')
+        self.radio_std = XRCCTRL(self, 'RADIO_STD')
+        self.radio_file = XRCCTRL(self, 'RADIO_FILE')
+        self.combo = XRCCTRL(self, 'COMBO_STD')
+        self.text = XRCCTRL(self, 'TEXT_FILE')
+        self.button = XRCCTRL(self, 'BUTTON_BROWSE')

         self.textModified = False
         self.SetAutoLayout(True)
         self.GetSizer().SetMinSize((260, -1))
         self.textModified = False
         self.SetAutoLayout(True)
         self.GetSizer().SetMinSize((260, -1))


@@ -879,5 +855,3 @@ paramDict = {
     'tooltip': ParamText, 'bitmap': ParamBitmap, 'icon': ParamBitmap,
     'encoding': ParamEncoding
     }
     'tooltip': ParamText, 'bitmap': ParamBitmap, 'icon': ParamBitmap,
     'encoding': ParamEncoding
     }

-
-

diff --git a/wxPython/wx/tools/XRCed/src-images/ToolGridBagSizer.png b/wxPython/wx/tools/XRCed/src-images/ToolGridBagSizer.png
new file mode 100644 (file)
index 0000000..d9730d0
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/ToolGridBagSizer.png differ

diff --git a/wxPython/wx/tools/XRCed/src-images/TreeSizerGridBag.png b/wxPython/wx/tools/XRCed/src-images/TreeSizerGridBag.png
new file mode 100644 (file)
index 0000000..0106444
Binary files /dev/null and b/wxPython/wx/tools/XRCed/src-images/TreeSizerGridBag.png differ

diff --git a/wxPython/wx/tools/XRCed/tools.py b/wxPython/wx/tools/XRCed/tools.py
index e10299faa9b1c955f28dfa61baf8d4f3f62b4758..a7819a56651d05e173e2a3d5d373ba0abab4884b 100644 (file)
--- a/wxPython/wx/tools/XRCed/tools.py
+++ b/wxPython/wx/tools/XRCed/tools.py
@@ -51,6 +51,7 @@ class Tools(wxPanel):
              (ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
              (ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
              (ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),
              (ID_NEW.STATIC_BOX_SIZER, images.getToolStaticBoxSizerBitmap()),
              (ID_NEW.GRID_SIZER, images.getToolGridSizerBitmap()),
              (ID_NEW.FLEX_GRID_SIZER, images.getToolFlexGridSizerBitmap()),

+             (ID_NEW.GRID_BAG_SIZER, images.getToolGridBagSizerBitmap()),

              (ID_NEW.SPACER, images.getToolSpacerBitmap())],
             ["Controls",
              (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),
              (ID_NEW.SPACER, images.getToolSpacerBitmap())],
             ["Controls",
              (ID_NEW.STATIC_TEXT, images.getToolStaticTextBitmap()),

diff --git a/wxPython/wx/tools/XRCed/tree.py b/wxPython/wx/tools/XRCed/tree.py
index 06e43c5d007573d545cdabf3d6bf0b71b66dad89..1bf871c1840c84a1035c2a2c40ef242b149cb3c0 100644 (file)
--- a/wxPython/wx/tools/XRCed/tree.py
+++ b/wxPython/wx/tools/XRCed/tree.py
@@ -6,6 +6,7 @@
 
 from xxx import *                       # xxx imports globals and params
 import types
 
 from xxx import *                       # xxx imports globals and params
 import types

+import traceback

 
 # Constant to define standart window name
 STD_NAME = '_XRCED_T_W'
 
 # Constant to define standart window name
 STD_NAME = '_XRCED_T_W'


@@ -83,6 +84,7 @@ class ID_NEW:
     STATIC_BOX_SIZER = wxNewId()
     GRID_SIZER = wxNewId()
     FLEX_GRID_SIZER = wxNewId()
     STATIC_BOX_SIZER = wxNewId()
     GRID_SIZER = wxNewId()
     FLEX_GRID_SIZER = wxNewId()

+    GRID_BAG_SIZER = wxNewId()

     SPACER = wxNewId()
     TOOL_BAR = wxNewId()
     TOOL = wxNewId()
     SPACER = wxNewId()
     TOOL_BAR = wxNewId()
     TOOL = wxNewId()


@@ -154,6 +156,7 @@ class PullDownMenu:
             ID_NEW.STATIC_BOX_SIZER: 'wxStaticBoxSizer',
             ID_NEW.GRID_SIZER: 'wxGridSizer',
             ID_NEW.FLEX_GRID_SIZER: 'wxFlexGridSizer',
             ID_NEW.STATIC_BOX_SIZER: 'wxStaticBoxSizer',
             ID_NEW.GRID_SIZER: 'wxGridSizer',
             ID_NEW.FLEX_GRID_SIZER: 'wxFlexGridSizer',

+            ID_NEW.GRID_BAG_SIZER: 'wxGridBagSizer',

             ID_NEW.SPACER: 'spacer',
             ID_NEW.UNKNOWN: 'unknown',
             }
             ID_NEW.SPACER: 'spacer',
             ID_NEW.UNKNOWN: 'unknown',
             }


@@ -178,6 +181,8 @@ class PullDownMenu:
              (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'),
              (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer',
               'Create flexgrid sizer'),
              (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'),
              (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer',
               'Create flexgrid sizer'),

+             (ID_NEW.GRID_BAG_SIZER, 'GridBagSizer',
+              'Create gridbag sizer'),

              (ID_NEW.SPACER, 'Spacer', 'Create spacer'),
              ]
         self.controls = [
              (ID_NEW.SPACER, 'Spacer', 'Create spacer'),
              ]
         self.controls = [


@@ -225,6 +230,8 @@ class PullDownMenu:
              (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'),
              (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer',
               'Create flexgrid sizer'),
              (ID_NEW.GRID_SIZER, 'GridSizer', 'Create grid sizer'),
              (ID_NEW.FLEX_GRID_SIZER, 'FlexGridSizer',
               'Create flexgrid sizer'),

+             (ID_NEW.GRID_BAG_SIZER, 'GridBagSizer',
+              'Create gridbag sizer'),

              (ID_NEW.SPACER, 'Spacer', 'Create spacer'),
              ]
             ]
              (ID_NEW.SPACER, 'Spacer', 'Create spacer'),
              ]
             ]


@@ -721,67 +728,77 @@ class XML_Tree(wxTreeCtrl):
             xmlFlags != wxXRC_USE_LOCALE
         res = wxXmlResource('', xmlFlags)
         res.Load('memory:xxx.xrc')
             xmlFlags != wxXRC_USE_LOCALE
         res = wxXmlResource('', xmlFlags)
         res.Load('memory:xxx.xrc')

-        if xxx.__class__ == xxxFrame:
-            # Frame can't have many children,
-            # but it's first child possibly can...
-#            child = self.GetFirstChild(item)[0]
-#            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
-#                # Clean-up before recursive call or error
-#                wxMemoryFSHandler_RemoveFile('xxx.xrc')
-#                wxEndBusyCursor()
-#                self.CreateTestWin(child)
-#                return
-            # This currently works under GTK, but not under MSW
-            testWin = g.testWin = wxPreFrame()
-            res.LoadOnFrame(testWin, g.frame, STD_NAME)
-            # Create status bar
-            testWin.panel = testWin
-            testWin.CreateStatusBar()
-            testWin.SetClientSize(testWin.GetBestSize())
-            testWin.panel = testWin
-            testWin.SetPosition(pos)
-            testWin.Show(True)
-        elif xxx.__class__ == xxxPanel:
-            # Create new frame
-            if not testWin:
-                testWin = g.testWin = wxFrame(g.frame, -1, 'Panel: ' + name,
+        try:
+            if xxx.__class__ == xxxFrame:
+                # Frame can't have many children,
+                # but it's first child possibly can...
+    #            child = self.GetFirstChild(item)[0]
+    #            if child.IsOk() and self.GetPyData(child).__class__ == xxxPanel:
+    #                # Clean-up before recursive call or error
+    #                wxMemoryFSHandler_RemoveFile('xxx.xrc')
+    #                wxEndBusyCursor()
+    #                self.CreateTestWin(child)
+    #                return
+                # This currently works under GTK, but not under MSW
+                testWin = g.testWin = wxPreFrame()
+                res.LoadOnFrame(testWin, g.frame, STD_NAME)
+                # Create status bar
+                testWin.panel = testWin
+                testWin.CreateStatusBar()
+                testWin.SetClientSize(testWin.GetBestSize())
+                testWin.panel = testWin
+                testWin.SetPosition(pos)
+                testWin.Show(True)
+            elif xxx.__class__ == xxxPanel:
+                # Create new frame
+                if not testWin:
+                    testWin = g.testWin = wxFrame(g.frame, -1, 'Panel: ' + name,
+                                                  pos=pos, name=STD_NAME)
+                testWin.panel = res.LoadPanel(testWin, STD_NAME)
+                testWin.SetClientSize(testWin.GetBestSize())
+                testWin.Show(True)
+            elif xxx.__class__ == xxxDialog:
+                testWin = g.testWin = res.LoadDialog(None, STD_NAME)
+                testWin.panel = testWin
+                testWin.Layout()
+                testWin.SetPosition(pos)
+                testWin.Show(True)
+                # Dialog's default code does not produce EVT_CLOSE
+                EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin)
+                EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin)
+            elif xxx.__class__ == xxxMenuBar:
+                testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name,
+                                              pos=pos, name=STD_NAME)
+                testWin.panel = None
+                # Set status bar to display help
+                testWin.CreateStatusBar()
+                testWin.menuBar = res.LoadMenuBar(STD_NAME)
+                testWin.SetMenuBar(testWin.menuBar)
+                testWin.Show(True)
+            elif xxx.__class__ == xxxToolBar:
+                testWin = g.testWin = wxFrame(g.frame, -1, 'ToolBar: ' + name,

                                               pos=pos, name=STD_NAME)
                                               pos=pos, name=STD_NAME)

-            testWin.panel = res.LoadPanel(testWin, STD_NAME)
-            testWin.SetClientSize(testWin.GetBestSize())
-            testWin.Show(True)
-        elif xxx.__class__ == xxxDialog:
-            testWin = g.testWin = res.LoadDialog(None, STD_NAME)
-            testWin.panel = testWin
-            testWin.Layout()
-            testWin.SetPosition(pos)
-            testWin.Show(True)
-            # Dialog's default code does not produce EVT_CLOSE
-            EVT_BUTTON(testWin, wxID_OK, self.OnCloseTestWin)
-            EVT_BUTTON(testWin, wxID_CANCEL, self.OnCloseTestWin)
-        elif xxx.__class__ == xxxMenuBar:
-            testWin = g.testWin = wxFrame(g.frame, -1, 'MenuBar: ' + name,
-                                          pos=pos, name=STD_NAME)
-            testWin.panel = None
-            # Set status bar to display help
-            testWin.CreateStatusBar()
-            testWin.menuBar = res.LoadMenuBar(STD_NAME)
-            testWin.SetMenuBar(testWin.menuBar)
-            testWin.Show(True)
-        elif xxx.__class__ == xxxToolBar:
-            testWin = g.testWin = wxFrame(g.frame, -1, 'ToolBar: ' + name,
-                                          pos=pos, name=STD_NAME)
-            testWin.panel = None
-            # Set status bar to display help
-            testWin.CreateStatusBar()
-            testWin.toolBar = res.LoadToolBar(testWin, STD_NAME)
-            testWin.SetToolBar(testWin.toolBar)
-            testWin.Show(True)
+                testWin.panel = None
+                # Set status bar to display help
+                testWin.CreateStatusBar()
+                testWin.toolBar = res.LoadToolBar(testWin, STD_NAME)
+                testWin.SetToolBar(testWin.toolBar)
+                testWin.Show(True)
+            testWin.item = item
+            EVT_CLOSE(testWin, self.OnCloseTestWin)
+            testWin.highLight = None
+            if highLight and not self.pendingHighLight:
+                self.HighLight(highLight)
+        except:
+            if g.testWin:
+                self.SetItemBold(item, False)
+                g.testWinPos = g.testWin.GetPosition()
+                g.testWin.Destroy()
+                g.testWin = None
+            inf = sys.exc_info()
+            wxLogError(traceback.format_exception(inf[0], inf[1], None)[-1])
+            wxLogError('Error loading resource')

         wxMemoryFSHandler_RemoveFile('xxx.xrc')
         wxMemoryFSHandler_RemoveFile('xxx.xrc')

-        testWin.item = item
-        EVT_CLOSE(testWin, self.OnCloseTestWin)
-        testWin.highLight = None
-        if highLight and not self.pendingHighLight:
-            self.HighLight(highLight)

         wxEndBusyCursor()
 
     def OnCloseTestWin(self, evt):
         wxEndBusyCursor()
 
     def OnCloseTestWin(self, evt):

diff --git a/wxPython/wx/tools/XRCed/xrced.py b/wxPython/wx/tools/XRCed/xrced.py
index f1ba7d58c841433dc8766690a8eae5bdd87dd129..8b44b5e2cf6dc41a368d9ff03a09c429f8457633 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.py
+++ b/wxPython/wx/tools/XRCed/xrced.py
@@ -348,7 +348,7 @@ class Frame(wxFrame):
         # Expanded container (must have children)
         elif tree.IsExpanded(selected) and tree.GetChildrenCount(selected, False):
             # Insert as first child
         # Expanded container (must have children)
         elif tree.IsExpanded(selected) and tree.GetChildrenCount(selected, False):
             # Insert as first child

-            nextItem = tree.GetFirstChild(selected, 0)[0]
+            nextItem = tree.GetFirstChild(selected)[0]

             parentLeaf = selected
         else:
             # No children or unexpanded item - appendChild stays True
             parentLeaf = selected
         else:
             # No children or unexpanded item - appendChild stays True


@@ -619,7 +619,7 @@ Homepage: http://xrced.sourceforge.net\
         # Expanded container (must have children)
         elif tree.shift and tree.IsExpanded(selected) \
            and tree.GetChildrenCount(selected, False):
         # Expanded container (must have children)
         elif tree.shift and tree.IsExpanded(selected) \
            and tree.GetChildrenCount(selected, False):

-            nextItem = tree.GetFirstChild(selected, 0)[0]
+            nextItem = tree.GetFirstChild(selected)[0]

             parentLeaf = selected
         else:
             nextItem = wxTreeItemId()
             parentLeaf = selected
         else:
             nextItem = wxTreeItemId()


@@ -701,7 +701,7 @@ Homepage: http://xrced.sourceforge.net\
         xxx = MakeXXXFromDOM(parentXXX, elem)
         # Update parent in child objects
         if tree.ItemHasChildren(selected):
         xxx = MakeXXXFromDOM(parentXXX, elem)
         # Update parent in child objects
         if tree.ItemHasChildren(selected):

-            i, cookie = tree.GetFirstChild(selected, 0)
+            i, cookie = tree.GetFirstChild(selected)

             while i.IsOk():
                 x = tree.GetPyData(i)
                 x.parent = xxx
             while i.IsOk():
                 x = tree.GetPyData(i)
                 x.parent = xxx


@@ -1004,6 +1004,7 @@ class App(wxApp):
 
 def main():
     app = App(0, useBestVisual=False)
 
 def main():
     app = App(0, useBestVisual=False)

+    #app.SetAssertMode(wxPYAPP_ASSERT_LOG)

     app.MainLoop()
     app.OnExit()
     global conf
     app.MainLoop()
     app.OnExit()
     global conf

diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index e712dbb1a40d9380be06d609e108704b0810ce46..c5b5463fe86ad5b912d506a076856b55ecb428b4 100644 (file)
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -10,6 +10,7 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="TEXT">
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="TEXT">

+              <size>250,100</size>

               <style>wxTE_MULTILINE</style>
             </object>
             <option>1</option>
               <style>wxTE_MULTILINE</style>
             </object>
             <option>1</option>


@@ -217,6 +218,48 @@
     </object>
     <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
   </object>
     </object>
     <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
   </object>

+  <object class="wxDialog" name="DIALOG_CHOICES">
+    <title>Choices</title>
+    <centered>1</centered>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxCheckList" name="CHECK_LIST">
+          <content/>
+          <size>250,250</size>
+          <style></style>
+        </object>
+        <option>1</option>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticLine"/>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OK">
+              <label>OK</label>
+              <default>1</default>
+            </object>
+            <flag>wxRIGHT</flag>
+            <border>10</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label>Cancel</label>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+        <border>10</border>
+      </object>
+    </object>
+    <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
+  </object>

   <object class="wxDialog" name="DIALOG_INTLIST">
     <title>Numbers</title>
     <centered>1</centered>
   <object class="wxDialog" name="DIALOG_INTLIST">
     <title>Numbers</title>
     <centered>1</centered>

diff --git a/wxPython/wx/tools/XRCed/xxx.py b/wxPython/wx/tools/XRCed/xxx.py
index e564f70873b398091eed457756876223d718b0f0..4e573703542f2525a5fb142e0c54cc775611089a 100644 (file)
--- a/wxPython/wx/tools/XRCed/xxx.py
+++ b/wxPython/wx/tools/XRCed/xxx.py
@@ -643,6 +643,28 @@ class xxxFlexGridSizer(xxxGridSizer):
             self.element.appendChild(node)
             self.special(param, node)
 
             self.element.appendChild(node)
             self.special(param, node)
 

+class xxxGridBagSizer(xxxSizer):
+    specials = ['growablecols', 'growablerows']
+    allParams = ['vgap', 'hgap'] + specials
+    paramDict = {'growablecols':ParamIntList, 'growablerows':ParamIntList}
+    # Special processing for growable* parameters
+    # (they are represented by several nodes)
+    def special(self, tag, node):
+        if not self.params.has_key(tag):
+            # Create new multi-group
+            self.params[tag] = xxxParamMulti(node)
+        self.params[tag].append(xxxParamInt(node))
+    def setSpecial(self, param, value):
+        # Straightforward implementation: remove, add again
+        self.params[param].remove()
+        del self.params[param]
+        for i in value:
+            node = g.tree.dom.createElement(param)
+            text = g.tree.dom.createTextNode(str(i))
+            node.appendChild(text)
+            self.element.appendChild(node)
+            self.special(param, node)
+

 # Container with only one child.
 # Not shown in tree.
 class xxxChildContainer(xxxObject):
 # Container with only one child.
 # Not shown in tree.
 class xxxChildContainer(xxxObject):


@@ -668,9 +690,13 @@ class xxxChildContainer(xxxObject):
         assert 0, 'no child found'
 
 class xxxSizerItem(xxxChildContainer):
         assert 0, 'no child found'
 
 class xxxSizerItem(xxxChildContainer):

-    allParams = ['option', 'flag', 'border', 'minsize']
-    paramDict = {'option': ParamInt, 'minsize': ParamPosSize}
+    allParams = ['option', 'flag', 'border', 'minsize', 'ratio']
+    paramDict = {'option': ParamInt, 'minsize': ParamPosSize, 'ratio': ParamPosSize}
+    #default = {'cellspan': '1,1'}

     def __init__(self, parent, element):
     def __init__(self, parent, element):

+        # For GridBag sizer items, extra parameters added
+        if isinstance(parent, xxxGridBagSizer):
+            self.allParams = self.allParams + ['cellpos', 'cellspan']

         xxxChildContainer.__init__(self, parent, element)
         # Remove pos parameter - not needed for sizeritems
         if 'pos' in self.child.allParams:
         xxxChildContainer.__init__(self, parent, element)
         # Remove pos parameter - not needed for sizeritems
         if 'pos' in self.child.allParams:


@@ -770,6 +796,7 @@ xxxDict = {
     'wxStaticBoxSizer': xxxStaticBoxSizer,
     'wxGridSizer': xxxGridSizer,
     'wxFlexGridSizer': xxxFlexGridSizer,
     'wxStaticBoxSizer': xxxStaticBoxSizer,
     'wxGridSizer': xxxGridSizer,
     'wxFlexGridSizer': xxxFlexGridSizer,

+    'wxGridBagSizer': xxxGridBagSizer,

     'sizeritem': xxxSizerItem,
     'spacer': xxxSpacer,
 
     'sizeritem': xxxSizerItem,
     'spacer': xxxSpacer,
 


@@ -784,7 +811,8 @@ xxxDict = {
 # Create IDs for all parameters of all classes
 paramIDs = {'fg': wxNewId(), 'bg': wxNewId(), 'exstyle': wxNewId(), 'font': wxNewId(),
             'enabled': wxNewId(), 'focused': wxNewId(), 'hidden': wxNewId(),
 # Create IDs for all parameters of all classes
 paramIDs = {'fg': wxNewId(), 'bg': wxNewId(), 'exstyle': wxNewId(), 'font': wxNewId(),
             'enabled': wxNewId(), 'focused': wxNewId(), 'hidden': wxNewId(),

-            'tooltip': wxNewId(), 'encoding': wxNewId()
+            'tooltip': wxNewId(), 'encoding': wxNewId(),
+            'cellpos': wxNewId(), 'cellspan': wxNewId()

             }
 for cl in xxxDict.values():
     if cl.allParams:
             }
 for cl in xxxDict.values():
     if cl.allParams: