- Latest Phoenix development integrated in the documentation builder;
- Added the latest `BitmapComboBox`, `RichToolTip` etc..., with their sample;
- Adapted the existing `adv` samples to use `wx.adv` in the code;
- Fixed wrong rendering of various snippets.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71692 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Andrea Gavana
2012-06-07 21:07:40 +00:00
parent 41aef0d14e
commit 14c7c36924
22 changed files with 37 additions and 16 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@@ -2,11 +2,11 @@
collpane = wx.CollapsiblePane(self, wx.ID_ANY, "Details:")
# add the pane with a zero proportion value to the 'sz' sizer which contains it
sz.Add(collpane, 0, wx.GROW|wx.ALL, 5)
sz.Add(collpane, 0, wx.GROW | wx.ALL, 5)
# now add a test label in the collapsible pane using a sizer to layout it:
win = collpane.GetPane()
paneSz = wx.BoxSizer(wx.VERTICAL)
paneSz.Add(wx.StaticText(win, wx.ID_ANY, "test!"), 1, wx.GROW|wx.ALL, 2)
paneSz.Add(wx.StaticText(win, wx.ID_ANY, "test!"), 1, wx.GROW | wx.ALL, 2)
win.SetSizer(paneSz)
paneSz.SetSizeHints(win)

View File

@@ -40,7 +40,7 @@
# Create the popup child control. Return true for success.
def Create(self, parent):
self.lc = wx.ListCtrl(parent, style=wx.LC_LIST|wx.LC_SINGLE_SEL|wx.SIMPLE_BORDER)
self.lc = wx.ListCtrl(parent, style=wx.LC_LIST | wx.LC_SINGLE_SEL | wx.SIMPLE_BORDER)
self.lc.Bind(wx.EVT_MOTION, self.OnMotion)
self.lc.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
return True

View File

@@ -10,7 +10,7 @@
# else: proceed asking to the user the new file to open
openFileDialog = wx.FileDialog(self, "Open XYZ file", "", "",
"XYZ files (*.xyz)|*.xyz", wx.FD_OPEN|wx.FD_FILE_MUST_EXIST)
"XYZ files (*.xyz)|*.xyz", wx.FD_OPEN | wx.FD_FILE_MUST_EXIST)
if openFileDialog.ShowModal() == wx.ID_CANCEL:
return # the user changed idea...

View File

@@ -2,7 +2,7 @@
def OnSaveAs(self, event):
saveFileDialog = wx.FileDialog(self, "Save XYZ file", "", "",
"XYZ files (*.xyz)|*.xyz", wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
"XYZ files (*.xyz)|*.xyz", wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
if saveFileDialog.ShowModal() == wx.ID_CANCEL:
return # the user changed idea...

View File

@@ -1,7 +1,7 @@
def OnAbout(self, event):
aboutInfo = wx.AboutDialogInfo()
aboutInfo = wx.adv.AboutDialogInfo()
aboutInfo.SetName("MyApp")
aboutInfo.SetVersion(MY_APP_VERSION_STRING)
aboutInfo.SetDescription(_("My wxPython-based application!"))
@@ -9,5 +9,5 @@
aboutInfo.SetWebSite("http:#myapp.org")
aboutInfo.AddDeveloper("My Self")
wx.AboutBox(aboutInfo)
wx.adv.AboutBox(aboutInfo)

View File

@@ -7,7 +7,7 @@
wx.Frame.__init__(self, parent)
# Create and initialize the banner.
banner = wx.BannerWindow(self, wx.TOP)
banner = wx.adv.BannerWindow(self, wx.TOP)
banner.SetText("Welcome to my wonderful program",
" Before doing anything else, you need to connect to "
"the online server.\n"

View File

@@ -0,0 +1,11 @@
password = wx.TextCtrl(parent, style=wx.TE_PASSWORD)
# Later on...
tip = wx.adv.RichToolTip("Caps Lock is on",
"You might have made an error in your password\n"
"entry because Caps Lock is turned on.\n"
"\n"
"Press Caps Lock key to turn it off.")
tip.SetIcon(wx.ICON_WARNING)
tip.ShowFor(password)

View File

@@ -1,2 +1,2 @@
wx.Sound(filename).Play(flags)
wx.adv.Sound(filename).Play(flags)

View File

@@ -1,2 +1,2 @@
wx.Sound(filename).Play(flags)
wx.adv.Sound(filename).Play(flags)

View File

@@ -1,8 +1,8 @@
bitmap = wx.Bitmap('splash16.png', wx.BITMAP_TYPE_PNG)
splash = wx.SplashScreen(bitmap, wx.SPLASH_CENTRE_ON_SCREEN|wx.SPLASH_TIMEOUT,
6000, None, -1, wx.DefaultPosition, wx.DefaultSize,
wx.BORDER_SIMPLE|wx.STAY_ON_TOP)
splash = wx.adv.SplashScreen(bitmap, wx.SPLASH_CENTRE_ON_SCREEN | wx.SPLASH_TIMEOUT,
6000, None, -1, wx.DefaultPosition, wx.DefaultSize,
wx.BORDER_SIMPLE | wx.STAY_ON_TOP)
wx.Yield()

View File

@@ -0,0 +1,9 @@
item = tree.GetFirstItem()
while item:
ok = item.IsOk()
item = tree.GetNextItem(item)
# Do something with every tree item ...

View File

@@ -1,11 +1,11 @@
def ShowSimpleAboutDialog(self, event):
info = wx.AboutDialogInfo()
info = wx.adv.AboutDialogInfo()
info.SetName(_("My Program"))
info.SetVersion(_("1.2.3 Beta"))
info.SetDescription(_("This program does something great."))
info.SetCopyright(wx.T("(C) 2007 Me <my@email.addre.ss>"))
wx.AboutBox(info)
wx.adv.AboutBox(info)

View File

@@ -24,7 +24,7 @@ from buildtools.config import phoenixDir, wxDir
IGNORE = ['wxPython', 'wxWidgets', 'wxOSX', 'wxMGL', 'wxDFB', 'wxMAC', 'wxGTK', 'wxGTK2', 'wxUniversal',
'OS', 'X', 'OSX', 'DFB', 'MAC', 'GTK', 'GTK2', 'MSW', 'wxMSW', 'X11', 'OS2', 'MS', 'XP', 'GTK+',
'UI', 'GUI', '--', 'OTOH', 'GDI+', 'API', 'NT', 'RTL', 'GDI', '3D', 'MDI', 'SDI', 'TDI', 'URL',
'XPM', 'HTML', 'MIME', 'C++', 'XDG', 'A4', 'A5']
'XPM', 'HTML', 'MIME', 'C++', 'XDG', 'A4', 'A5', 'KDE', 'GNOME', 'XFCE']
# C++ stuff to Python/ReST stuff
VALUE_MAP = {'true': '``True``',
@@ -90,6 +90,7 @@ NO_MODULE = {
'SashDragStatus' : 'adv.',
'SashEdgePosition' : 'adv.',
'TaskBarIconType' : 'adv.',
'TipKind' : 'adv.',
# -- wxDataView -- #
# Widgets