Load the frame icons from a .py file so I don't have to figure out how

to tell distutils to install the .ico in the right place...

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

diff --git a/wxPython/wxPython/lib/PyCrust/crust.py b/wxPython/wxPython/lib/PyCrust/crust.py
index 45de8b585ad561f8bda474691f91f0385c032a98..435b1ed64a4d05f469c5c6b3291464a5a0c16c2f 100644 (file)
--- a/wxPython/wxPython/lib/PyCrust/crust.py
+++ b/wxPython/wxPython/lib/PyCrust/crust.py
@@ -56,9 +56,8 @@ class CrustFrame(wxFrame, ShellMenu):
         intro += '\nSponsored by Orbtech - Your source for Python programming expertise.'
         self.CreateStatusBar()
         self.SetStatusText(intro.replace('\n', ', '))
         intro += '\nSponsored by Orbtech - Your source for Python programming expertise.'
         self.CreateStatusBar()
         self.SetStatusText(intro.replace('\n', ', '))

-        filename = os.path.join(os.path.dirname(__file__), 'PyCrust.ico')
-        icon = wxIcon(filename, wxBITMAP_TYPE_ICO)
-        self.SetIcon(icon)
+        import images
+        self.SetIcon(images.getPyCrustIcon())

         self.crust = Crust(parent=self, intro=intro, \
                            rootObject=rootObject, \
                            rootLabel=rootLabel, \
         self.crust = Crust(parent=self, intro=intro, \
                            rootObject=rootObject, \
                            rootLabel=rootLabel, \

diff --git a/wxPython/wxPython/lib/PyCrust/images.py b/wxPython/wxPython/lib/PyCrust/images.py
new file mode 100644 (file)
index 0000000..375e200
--- /dev/null
+++ b/wxPython/wxPython/lib/PyCrust/images.py
@@ -0,0 +1,71 @@
+#----------------------------------------------------------------------
+# This file was generated by ../scripts/img2py
+#
+from wxPython.wx import wxImageFromStream, wxBitmapFromImage
+from wxPython.wx import wxEmptyIcon
+import cStringIO
+
+
+def getPyCrustData():
+    return \
+'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00 \x00\x00\x00 \x08\x06\x00\
+\x00\x00szz\xf4\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\x00\x04\
+\x95IDATx\x9c\xed\x97?lSG\x1c\xc7?\x97\x98\xd8Q\xa3\xdeY\xa2j\x06\xa4\xf7"QJ\
+\xbb<3@\x01\xa9\xc2\x0c\xa8!\x1d\x1c6\xcaB\xa8D[uI2\xf4\x8f\xe8\x103\xb4\xa2\
+,5\x0b\x03\x032C\xab\xc0\x92dh:t\xc0)*E\xcd@<Q\x01Rl\t\xd4D\xaa\xe4{R\xd0{&\
+\xa5\xd7\xe1\xfc\xec\xe7\xfciR\x08e\xe9O\xb2\xee|\xfe\xbd\xfb}~\xdf\xdf\xbd\
+\xbb\xb3PJ\xf1"\xad\xe3\x85F\xff\x1f\xe0y\x03h\xad\xcdA\xc7~\xb4\xd6f-\x9f\
+\xc4\xf3\x0c>Y\x1c#\x97\xddCUk\xf4B\x8d3\x9f\x8d\x9a\x9bU%\xe2~b\xab\xdf\x82\
+\x83N+\xd3\xe92\\\x1f\xcf\x93\xdd\x9f\xa1\xaa5\x95\xf9\n\xe7\xf3y\xe2\x10[V\
+\x82H\xe6\xd3G\x1dN\xf7\xc3\xa7\xc7a\xc0\x83\xc3\xc7\xf3\xcc\xcc\xcd\xe3(\
+\x85\xdb\xe7\xf2\xc9\xe8X\x1b\xe43+\x10\xd5\xb6\x94\x87Z\xe8\x90NU\x91I@\x00\
+\x06\xbe\x18\xb7J\x98\xca$`\x98\xb9]&{,\x8fRV\x85\xa7V@k\x9bq)o\x83+\t\xe9T\
+\xd5f\x95\x02\x91\xb4~_\r\xd9\xb6\xbaP\x03\x04n\x9f\xcbDa\xb8\t\xfe\xaf\x17a\
+<\xe3\xc8\x94lo\x9b\xd6\xa8\xf4\x80\x07\xb7o\xcd\xe0\x0c\x0e\xa2R\x8a\xb4\
+\x93n\xbal\x1a`e\xe0U\xc1\xd6\xb0\xb8\n\x99\x91"\x93\xaf\xba\xe4\x0ed\xda|6,\
+\x81\xd6\xda\x9c|\xab]\xea\xcd\x04\x8f\x9b\t\xad\nz\xa1\x02\x80\xdb\xe7R\x1a\
+\xcf\xa3\xb56\xeb\x02D5\x9e\xf8\xdc\xe1T\xff\xd3\x05\x8e\x82\x83U\xe1Z\xb1\
+\x18\x9b\xbf\x06\xacQ\x82H\xea\x01/Z@Ut\x08R\xb4$}\x16\xd3\x81A&%\xde\xee\
+\xbev\x80x\xe0]{\xb2\x1cR\xa5\xe6C*\xb5\xf1\xc4Q\xa6"e\xfbQ\x1b\x8dE\xe6\x87\
+>\xaa[Q\xadi\x0b\xb0r\x8f\x9e.\xc3t\xb9\xc4]\xaf5\xf6\xfe\xdb\xddt&\x02\xfa\
+\x9c\xf5\x01\xe2A\xa2\xbeX\x01>]ntR\x12\xe3[\x00\x01\x98\x89\x11[_\xed\xafn\
+\xab\x81U\xa0\xe7I7\x00\x97o\x04\xcd\x89\x06<;\xe9\x80\x07]i\x97\xc17\x1f\
+\xd2\xd3\x91`\xe9\xaf?\x01p^Y\x06Z\n\xfau8?a\xfb]i\x97\xec\xa1\x8c\x05(|\xd8\
+N\xba\xb3\xab\x87\xfb\x8f\x97\xd8\xd9\xd5\x03\xc0\xfd\xc7K\xec\xd8\xd6\xdd\
+\xfc\xfd\xc1r\xd0\xf4\x01\xda~\x03H\xf4\x04\xd4j :\xb75\xc7\xae\xfd\xbcLW\
+\xda\xa5\xf0M\x1e\t\xcc\xcc\xcdq\xa9P@\x8c\xf5fL\xdaHF\x16g\x9a\x19\xad\xcc\
+\xee\xcb\xa3\n\xad\xa1\xda\xf1\x08\xef\xe5\x97x\xf8\xc8f\xf8\xc7\x93:\xdb;\
+\x93M\xc8\x08j\xc7\xb6n\x1e,\x07m`\x97o\x04|;>\xd1T\xc4\x17\x8a\x13\xb9\xc3\
+\x88\x01\x0fs\xa4\x9cc}\xf3A\x190\x82\x1f\xddR{-\x1bV\xfc\xd8f\xba\xbd3\xd9\
+\x06\x15\x07\xbb\xf8\xd3\x12\xdf]-"\x93\xb2\xb1C*\xde\xcd\x1d\xde\xccN(\xc1\
+\xae\x17"\xd0#+<j\x17m{\xcd\x9bj\x00.\xaf\xf0Xb\xb8\xdfA\xa6\x14\x18\x03\x06\
+\xb4o\xcf\x8d\xc4\xbervc\x86M\xdaz\x80\x00\x95T\x19?\xd0 @&%~c\xbc\xe3W\xaf\
+\xb4e\x00\xffh\xc6@\xbd\x11\xbc\xde\x1a\xfe\xef.\xa5\xa2q4\n0\x81\xad\xe9\
+\xae7<\x12\xaf\xf5\xc2hy\xaa\xe97\x9cS\\\x98\xb2\x0e\x03\xb1\xcdhW\xdaC\x1a\
+\xa0\xa2\xa0\x0e"\x14`\xb0Y\x85\x1b\x1f\x12\xaa7\x03)\xd9\x84\xa8\xccW\xb8{\
+\xa7L\xe2\xde\x02\x94\xc6Gp_\xcf\x80\x90\x98\xd0g\xf4\xac\x82Pc\x82\x1a\xd5\
+\x10\x08}&\xa7J\xcc\xde.1]m\x80\xf6+\xee\xfd\xae\x9bo\xc4\xf0;\x80\xef\x90\
+\x0e\x04\x06`Q!\x02\x05\xc2 \xb5\xc2\x95\x15d\xb4C&[\xf7\xd2\x04\x80\xbb\xdb\
+\x9e\xd1\x8e\x02\x90\xd8\xd4$ I\x87\x80\xf1\xf1\xdc!4\xc3\x88\x94}\xd8,TH\
+\xbb.5m\xf0C\x9f3\x1f\r\x01\x96.\x82\x1a9\xe9Q\xb8\xd2\xf8\xf25\x0c\xbe\xe7#\
+\x92\x12\x1d[\x03\t\x00E\xf4\xa6\t\xaaZ7`$\x18\x90\xf8\xf8\x80JK\x94\xa1\x01\
+\x07\xb8\x0e~X\xc3\xed\x16\xf8)\xf8~j\x12B\rI\x89_\xf7!0 \x04\xf9Q\xc0\x18\
+\x0c\xd1i\xea\x13\xb7\x04\xc0\x89\x93C\xabj\xb6\xf7@\x96\xd9_J|0:\x86R\n\xb7\
+\xd7@\xaa%\x9d\xa3$\xba.\x90RA]\xe3\x87\x1a\x89\xdd\xefeR\xc2\x1a\'\xa8\x1f\
+\x82\x0e-@m\xd1\xde\x076\xbc\x15\x97~(\x9a\x89b\x9e\xd9[s\xab!\xf7g\xd6\x1c\
+\x8f\xdb\xbel\x8e\xa1S\xc7\xda\xc6\xe6\xee\xccs\xe9\xdcYnV\x95\xd8\xf2?&q+\
+\x9c\x1b1\xf3\xbf\xcd3{\xfdJ\xdb\xf8\xde\xfd\x19.\\\xad\x08\x80\xbf\x01\xd1\
+\x86\xfa\x8b\xc7\xc0\xc8\xb7\x00\x00\x00\x00IEND\xaeB`\x82' 
+
+def getPyCrustBitmap():
+    return wxBitmapFromImage(getPyCrustImage())
+
+def getPyCrustImage():
+    stream = cStringIO.StringIO(getPyCrustData())
+    return wxImageFromStream(stream)
+
+def getPyCrustIcon():
+    icon = wxEmptyIcon()
+    icon.CopyFromBitmap(getPyCrustBitmap())
+    return icon
+

diff --git a/wxPython/wxPython/lib/PyCrust/shell.py b/wxPython/wxPython/lib/PyCrust/shell.py
index 8af395ed7622d6b84014c92981a5421142215dbd..693c9408e5fe05e5d02e1bd14b4ecf1dfd21e9be 100644 (file)
--- a/wxPython/wxPython/lib/PyCrust/shell.py
+++ b/wxPython/wxPython/lib/PyCrust/shell.py
@@ -50,7 +50,7 @@ else:  # GTK
 class ShellFacade:
     """Simplified interface to all shell-related functionality.
 
 class ShellFacade:
     """Simplified interface to all shell-related functionality.
 

-    This is a semi-transparent facade, in that all attributes of other are 
+    This is a semi-transparent facade, in that all attributes of other are

     still accessible, even though only some are visible to the user."""
 
     name = 'PyCrust Shell Interface'
     still accessible, even though only some are visible to the user."""
 
     name = 'PyCrust Shell Interface'


@@ -574,7 +574,7 @@ class Shell(wxStyledTextCtrl):
         # The user hit ENTER and we need to decide what to do. They could be
         # sitting on any line in the shell.
 
         # The user hit ENTER and we need to decide what to do. They could be
         # sitting on any line in the shell.
 

-        thepos = self.GetCurrentPos()        
+        thepos = self.GetCurrentPos()

         startpos = self.promptPosEnd
         endpos = self.GetTextLength()
         # If they hit RETURN inside the current command, execute the command.
         startpos = self.promptPosEnd
         endpos = self.GetTextLength()
         # If they hit RETURN inside the current command, execute the command.


@@ -661,7 +661,7 @@ class Shell(wxStyledTextCtrl):
         elif text[:ps2size] == ps2:
             text = text[ps2size:]
         return text
         elif text[:ps2size] == ps2:
             text = text[ps2size:]
         return text

-    
+

     def push(self, command):
         """Send command to the interpreter for execution."""
         busy = wxBusyCursor()
     def push(self, command):
         """Send command to the interpreter for execution."""
         busy = wxBusyCursor()


@@ -766,11 +766,11 @@ class Shell(wxStyledTextCtrl):
         >>> shell.run('print "this"')
         >>> print "this"
         this
         >>> shell.run('print "this"')
         >>> print "this"
         this

-        >>> 
+        >>>

         """
         # Go to the very bottom of the text.
         endpos = self.GetTextLength()
         """
         # Go to the very bottom of the text.
         endpos = self.GetTextLength()

-        self.SetCurrentPos(endpos)        
+        self.SetCurrentPos(endpos)

         command = command.rstrip()
         if prompt: self.prompt()
         if verbose: self.write(command)
         command = command.rstrip()
         if prompt: self.prompt()
         if verbose: self.write(command)


@@ -791,9 +791,9 @@ class Shell(wxStyledTextCtrl):
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""

-        list = self.interp.getAutoCompleteList(command, 
-                    includeMagic=self.autoCompleteIncludeMagic, 
-                    includeSingle=self.autoCompleteIncludeSingle, 
+        list = self.interp.getAutoCompleteList(command,
+                    includeMagic=self.autoCompleteIncludeMagic,
+                    includeSingle=self.autoCompleteIncludeSingle,

                     includeDouble=self.autoCompleteIncludeDouble)
         if list:
             options = ' '.join(list)
                     includeDouble=self.autoCompleteIncludeDouble)
         if list:
             options = ' '.join(list)


@@ -957,7 +957,7 @@ class Shell(wxStyledTextCtrl):
                             command += '\n'
                             command += line
                     commands.append(command)
                             command += '\n'
                             command += line
                     commands.append(command)

-                    for command in commands:    
+                    for command in commands:

                         command = command.replace('\n', os.linesep + sys.ps2)
                         self.write(command)
                         self.processLine()
                         command = command.replace('\n', os.linesep + sys.ps2)
                         self.write(command)
                         self.processLine()


@@ -972,7 +972,7 @@ class Shell(wxStyledTextCtrl):
 
     def zoom(self, points=0):
         """Set the zoom level.
 
     def zoom(self, points=0):
         """Set the zoom level.

-        
+

         This number of points is added to the size of all fonts.
         It may be positive to magnify or negative to reduce."""
         self.SetZoom(points)
         This number of points is added to the size of all fonts.
         It may be positive to magnify or negative to reduce."""
         self.SetZoom(points)


@@ -1169,9 +1169,8 @@ class ShellFrame(wxFrame, ShellMenu):
         intro += '\nSponsored by Orbtech - Your source for Python programming expertise.'
         self.CreateStatusBar()
         self.SetStatusText(intro.replace('\n', ', '))
         intro += '\nSponsored by Orbtech - Your source for Python programming expertise.'
         self.CreateStatusBar()
         self.SetStatusText(intro.replace('\n', ', '))

-        filename = os.path.join(os.path.dirname(__file__), 'PyCrust.ico')
-        icon = wxIcon(filename, wxBITMAP_TYPE_ICO)
-        self.SetIcon(icon)
+        import images
+        self.SetIcon(images.getPyCrustIcon())

         self.shell = Shell(parent=self, id=-1, introText=intro, \
                            locals=locals, InterpClass=InterpClass, \
                            *args, **kwds)
         self.shell = Shell(parent=self, id=-1, introText=intro, \
                            locals=locals, InterpClass=InterpClass, \
                            *args, **kwds)

diff --git a/wxPython/wxPython/tools/XRCed/xrced.py b/wxPython/wxPython/tools/XRCed/xrced.py
index 7e6c2797a86c1e01b52c2d1ef5db11bc752e1f87..9c81402bd5b5733cc603ad0a7df28fdd442893fc 100644 (file)
--- a/wxPython/wxPython/tools/XRCed/xrced.py
+++ b/wxPython/wxPython/tools/XRCed/xrced.py
@@ -1000,8 +1000,10 @@ class Frame(wxFrame):
         frame = self
         wxFrame.__init__(self, None, -1, '', pos, size)
         self.CreateStatusBar()
         frame = self
         wxFrame.__init__(self, None, -1, '', pos, size)
         self.CreateStatusBar()

-        progpath = os.path.split(__file__)[0]
-        icon = wxIcon(os.path.join(progpath, 'xrced.ico'), wxBITMAP_TYPE_ICO)
+        #progpath = os.path.split(__file__)[0]
+        #icon = wxIcon(os.path.join(progpath, 'xrced.ico'), wxBITMAP_TYPE_ICO)
+        icon = wxEmptyIcon()
+        icon.CopyFromBitmap(images.getIconBitmap())

         self.SetIcon(icon)
 
         # Idle flag
         self.SetIcon(icon)
 
         # Idle flag