Make taskbar icon size dependent on platform. Other tweaks.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -31,18 +31,7 @@ import images
|
|||||||
_treeList = [
|
_treeList = [
|
||||||
# new stuff
|
# new stuff
|
||||||
('Recent Additions and Updates', [
|
('Recent Additions and Updates', [
|
||||||
'VListBox',
|
'OGL',
|
||||||
'Listbook',
|
|
||||||
'MaskedNumCtrl',
|
|
||||||
'FloatCanvas',
|
|
||||||
'XmlResourceSubclass',
|
|
||||||
'GridBagSizer',
|
|
||||||
'Cursor',
|
|
||||||
'PyPlot',
|
|
||||||
'ImageAlpha',
|
|
||||||
'ActiveX_FlashWindow',
|
|
||||||
'ActiveX_IEHtmlWindow',
|
|
||||||
'ActiveX_PDFWindow',
|
|
||||||
]),
|
]),
|
||||||
|
|
||||||
# managed windows == things with a (optional) caption you can close
|
# managed windows == things with a (optional) caption you can close
|
||||||
@@ -445,8 +434,14 @@ class wxPythonDemo(wx.Frame):
|
|||||||
|
|
||||||
if wx.Platform != '__WXMAC__':
|
if wx.Platform != '__WXMAC__':
|
||||||
# setup a taskbar icon, and catch some events from it
|
# setup a taskbar icon, and catch some events from it
|
||||||
|
if wx.Platform == '__WXGTK__':
|
||||||
|
dimension = 22
|
||||||
|
else:
|
||||||
|
dimension = 16
|
||||||
icon = wx.IconFromBitmap(
|
icon = wx.IconFromBitmap(
|
||||||
images.getMondrianImage().Scale(16,16).ConvertToBitmap() )
|
images.getMondrianImage().Scale(dimension,dimension).ConvertToBitmap() )
|
||||||
|
#icon = wx.Icon('bmp_source/mondrian.ico', wx.BITMAP_TYPE_ICO)
|
||||||
|
#icon = images.getMondrianIcon()
|
||||||
self.tbicon = wx.TaskBarIcon()
|
self.tbicon = wx.TaskBarIcon()
|
||||||
self.tbicon.SetIcon(icon, "wxPython Demo")
|
self.tbicon.SetIcon(icon, "wxPython Demo")
|
||||||
self.tbicon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
|
self.tbicon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
|
||||||
@@ -953,13 +948,12 @@ def main():
|
|||||||
overview = """<html><body>
|
overview = """<html><body>
|
||||||
<h2>wxPython</h2>
|
<h2>wxPython</h2>
|
||||||
|
|
||||||
<p> wxPython is a <b>GUI toolkit</b> for the <a
|
<p> wxPython is a <b>GUI toolkit</b> for the Python programming
|
||||||
href="http://www.python.org/">Python</a> programming language. It
|
language. It allows Python programmers to create programs with a
|
||||||
allows Python programmers to create programs with a robust, highly
|
robust, highly functional graphical user interface, simply and easily.
|
||||||
functional graphical user interface, simply and easily. It is
|
It is implemented as a Python extension module (native code) that
|
||||||
implemented as a Python extension module (native code) that wraps the
|
wraps the popular wxWindows cross platform GUI library, which is
|
||||||
popular <a href="http://wxwindows.org/front.htm">wxWindows</a> cross
|
written in C++.
|
||||||
platform GUI library, which is written in C++.
|
|
||||||
|
|
||||||
<p> Like Python and wxWindows, wxPython is <b>Open Source</b> which
|
<p> Like Python and wxWindows, wxPython is <b>Open Source</b> which
|
||||||
means that it is free for anyone to use and the source code is
|
means that it is free for anyone to use and the source code is
|
||||||
|
Reference in New Issue
Block a user