diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.bitmapcombobox.png new file mode 100644 index 00000000..a430db20 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.bitmapcombobox.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.richtooltip.png new file mode 100644 index 00000000..ded9c1d0 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.richtooltip.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.timepickerctrl.png new file mode 100644 index 00000000..d7f1fbcb Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxgtk/adv.timepickerctrl.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.bitmapcombobox.png new file mode 100644 index 00000000..403ed663 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.bitmapcombobox.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.richtooltip.png new file mode 100644 index 00000000..4d91849d Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.richtooltip.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.timepickerctrl.png new file mode 100644 index 00000000..674cb466 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmac/adv.timepickerctrl.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.bitmapcombobox.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.bitmapcombobox.png new file mode 100644 index 00000000..109ee311 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.bitmapcombobox.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.richtooltip.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.richtooltip.png new file mode 100644 index 00000000..2521720b Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.richtooltip.png differ diff --git a/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.timepickerctrl.png b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.timepickerctrl.png new file mode 100644 index 00000000..6cc4c998 Binary files /dev/null and b/docs/sphinx/_static/images/widgets/fullsize/wxmsw/adv.timepickerctrl.png differ diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py index 9d4b5f9a..cef33f08 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/CollapsiblePane.1.py @@ -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) diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py index 5f8501e7..a4279c25 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/ComboCtrl.1.py @@ -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 diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py index b3280939..97c2e808 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.1.py @@ -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... diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py b/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py index 6d0f6de1..e47a38d6 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/FileDialog.2.py @@ -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... diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py index 861b5428..e0ce20e2 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.AboutDialogInfo.1.py @@ -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) diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py index a55fa52d..ce4d1933 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.BannerWindow.1.py @@ -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" diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.RichToolTip.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.RichToolTip.1.py new file mode 100644 index 00000000..c06eaf64 --- /dev/null +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.RichToolTip.1.py @@ -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) diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py index 30f437f9..af304651 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.Play.1.py @@ -1,2 +1,2 @@ - wx.Sound(filename).Play(flags) + wx.adv.Sound(filename).Play(flags) diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py index 30f437f9..af304651 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.Sound.PlaySound.1.py @@ -1,2 +1,2 @@ - wx.Sound(filename).Play(flags) + wx.adv.Sound(filename).Play(flags) diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py index 7640da55..7ca93725 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.SplashScreen.1.py @@ -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() diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.TreeListCtrl.GetNextItem.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.TreeListCtrl.GetNextItem.1.py new file mode 100644 index 00000000..f63b5553 --- /dev/null +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.TreeListCtrl.GetNextItem.1.py @@ -0,0 +1,9 @@ + + item = tree.GetFirstItem() + + while item: + ok = item.IsOk() + item = tree.GetNextItem(item) + + # Do something with every tree item ... + diff --git a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py index ed610767..03ae1771 100644 --- a/docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py +++ b/docs/sphinx/rest_substitutions/snippets/python/converted/adv.functions.AboutBox.1.py @@ -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 ")) - wx.AboutBox(info) + wx.adv.AboutBox(info) diff --git a/sphinxtools/constants.py b/sphinxtools/constants.py index 7a8866bb..0ff3275b 100644 --- a/sphinxtools/constants.py +++ b/sphinxtools/constants.py @@ -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