From dad1c9b9ae6eae6af9bf518f94e2ff578ad061f8 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Fri, 11 May 2007 15:28:01 +0000
Subject: [PATCH] rename new image, add to encode_bitmaps.py

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@45961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 .../{winprops.png => customcontrol.png}       | Bin
 wxPython/demo/encode_bitmaps.py               |   1 +
 wxPython/demo/images.py                       |  19 ++++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)
 rename wxPython/demo/bmp_source/{winprops.png => customcontrol.png} (100%)

diff --git a/wxPython/demo/bmp_source/winprops.png b/wxPython/demo/bmp_source/customcontrol.png
similarity index 100%
rename from wxPython/demo/bmp_source/winprops.png
rename to wxPython/demo/bmp_source/customcontrol.png
diff --git a/wxPython/demo/encode_bitmaps.py b/wxPython/demo/encode_bitmaps.py
index 88f93d35a2..39366991d5 100644
--- a/wxPython/demo/encode_bitmaps.py
+++ b/wxPython/demo/encode_bitmaps.py
@@ -125,6 +125,7 @@ command_lines = [
     "-a -u -c bmp_source/pyshell.png           images.py",
     "-a -u -c bmp_source/recent.png            images.py",
     "-a -u -c bmp_source/saveperspective.png   images.py",
+    "-a -u -c bmp_source/customcontrol.png     images.py",
 
 
     "   -u -c bmp_source/001.png throbImages.py",
diff --git a/wxPython/demo/images.py b/wxPython/demo/images.py
index 29f5061e29..e2084b1a65 100644
--- a/wxPython/demo/images.py
+++ b/wxPython/demo/images.py
@@ -14408,7 +14408,9 @@ catalog['saveperspective'].getData = getsaveperspectiveData
 catalog['saveperspective'].getImage = getsaveperspectiveImage
 catalog['saveperspective'].getBitmap = getsaveperspectiveBitmap
 
-def getCustomControlData():
+
+#----------------------------------------------------------------------
+def getcustomcontrolData():
     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\
@@ -14439,16 +14441,17 @@ def getCustomControlData():
 \xe4\xaf\xc1/_\xff\xb7\xdf\xfd\x17\xfd\r*\xb1L*W\n\xe5H\x00\x00\x00\x00IEND\
 \xaeB`\x82' 
 
-def getCustomControlBitmap():
-    return BitmapFromImage(getCustomControlImage())
+def getcustomcontrolBitmap():
+    return BitmapFromImage(getcustomcontrolImage())
 
-def getCustomControlImage():
-    stream = cStringIO.StringIO(getCustomControlData())
+def getcustomcontrolImage():
+    stream = cStringIO.StringIO(getcustomcontrolData())
     return ImageFromStream(stream)
 
 index.append('customcontrol')
 catalog['customcontrol'] = ImageClass()
-catalog['customcontrol'].getData = getCustomControlData
-catalog['customcontrol'].getImage = getCustomControlImage
-catalog['customcontrol'].getBitmap = getCustomControlBitmap
+catalog['customcontrol'].getData = getcustomcontrolData
+catalog['customcontrol'].getImage = getcustomcontrolImage
+catalog['customcontrol'].getBitmap = getcustomcontrolBitmap
+