projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed include paths to our copies of 3rd party libs
[wxWidgets.git]
/
wxPython
/
demo
/
wxStaticBitmap.py
diff --git
a/wxPython/demo/wxStaticBitmap.py
b/wxPython/demo/wxStaticBitmap.py
index 467f56d604766833618363930bc2377b13e47a6b..d281d602375faf92f9f0ad662d3649f072ac935c 100644
(file)
--- a/
wxPython/demo/wxStaticBitmap.py
+++ b/
wxPython/demo/wxStaticBitmap.py
@@
-1,8
+1,6
@@
from wxPython.wx import *
from wxPython.wx import *
-from Main import opj
-import string
import images
#----------------------------------------------------------------------
import images
#----------------------------------------------------------------------
@@
-21,11
+19,7
@@
class TestPanel(wxPanel):
wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
wxSize(bmp.GetWidth(), bmp.GetHeight()))
wxStaticBitmap(self, -1, bmp, wxPoint(80, 50),
wxSize(bmp.GetWidth(), bmp.GetHeight()))
- # This one doesn't convert to the embedded format very well,
- # (lots of colors so it explodes in size and takes a noticable
- # amount of time to convert back to a bitmap.) So we'll just
- # do it the old way
- bmp = wxBitmap(opj('bitmaps/robin.jpg'), wxBITMAP_TYPE_JPEG)
+ bmp = images.getRobinBitmap()
wxStaticBitmap(self, -1, bmp, (80, 150))
wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",
wxStaticBitmap(self, -1, bmp, (80, 150))
wxStaticText(self, -1, "Hey, if Ousterhout can do it, so can I.",