Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,894 Commits 8 Branches 23 Tags
09223c530fe0484774692d7d8d0521d0482d5417
Commit Graph

2894 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher H.Barker, PhD
09223c530f added float() calls to get the proper divison when scaling bitmaps 
In response to a note from Kevin Gregory:

""
Sorry to email you directly, I wanted to submit a bugfix for FloatCanvas ScaledBitmap. It changes the bmpWidth and bmpHeight from integers to floats so that the scale is computed correctly.
FCObjects.py line 2141 from the wxpython phoenix dev build
"""
 2017-04-13 11:17:36 -07:00
Robin Dunn
8ce1232758 Merge pull request #258 from radarhere/master 
Removed unused variables
 2017-04-04 13:18:14 -07:00
Andrew Murray
634dda427c Removed unused variables 2017-04-04 19:37:55 +10:00
Robin Dunn
36b8076026 Merge pull request #262 from david-hughes/deadexcept 
Occurrences of wx.PyDeadObjectError replaced by RuntimeError
 2017-04-03 21:19:05 -07:00
Robin Dunn
1e848ebf9a Merge pull request #261 from swt2c/fix_propgridadvprops_test 
Fix wx.propgrib.MultiChoiceProperty test
 2017-04-03 21:16:58 -07:00
Robin Dunn
cc57bbf85f Merge pull request #260 from swt2c/fix_richtext_pi 
Set piBases for RichTextFormattingDialog
 2017-04-03 21:16:09 -07:00
Robin Dunn
60ba3b6dcb Merge pull request #257 from wettenhj/minimal-test-fixes 
Minimal test fixes
 2017-04-03 21:08:00 -07:00
David Hughes
31385bf2db Occurrences of PyDeadObjectError replaced by RuntimeError 2017-03-29 11:43:33 +01:00
Scott Talbert
c2655e24f9 Fix wx.propgrib.MultiChoiceProperty test 2017-03-28 21:15:59 -04:00
Scott Talbert
fc5d3dfe2e Set piBases for RichTextFormattingDialog 
Fixes:
======================================================================
FAIL: test_richtext_pi (__main__.PIImportTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "unittests/test_pi_import.py", line 60, in test_richtext_pi
    self.runPI('richtext.pi')
  File "unittests/test_pi_import.py", line 32, in runPI
    self.assertEqual(sp.returncode, 0, stdout)
AssertionError: 1 != 0 : b'Traceback (most recent call last):\n  File "richtext.pi", line 11292, in <module>\n    class RichTextFormattingDialog(PropertySheetDialog):\nNameError: name \'PropertySheetDialog\' is not defined\n'

----------------------------------------------------------------------
 2017-03-28 20:33:04 -04:00
James Wettenhall
d0b1707901 Disabling "pti.page" RibbonPageTabInfo attribute test. It looks like 
wxRibbonPageTabInfoArray isn't being wrapped into a valid Python object.
 2017-03-23 22:03:46 +11:00
James Wettenhall
d62a4ed7bb Call Dismiss, so the preferences editor doesn't linger. 2017-03-23 22:03:19 +11:00
James Wettenhall
de9edce1b1 Wait 300 milliseconds before tearDown to give the FlickerTLW's wx.CallLater 
a chance to run, which avoids this exception:

wx/core.py, line 3096, in Notify
    self.result = self.callable(*self.args, **self.kwargs)
RuntimeError: wrapped C/C++ object of type Filling has been deleted

Ensure that the Crust object's "lastsashpos" attribute is defined to avoid this exception:

wx/py/crust.py", line 150, in SaveSettings
    if self.lastsashpos != -1:
AttributeError: 'Crust' object has no attribute 'lastsashpos'
 2017-03-23 22:02:13 +11:00
James Wettenhall
f5aca9d312 Destroying each FloatCanvas instance before tearDown avoids exceptions like 
this:

wx/lib/floatcanvas/FCObjects.py, line 746, in _Draw
    dc.DrawLines(Points)
TypeError: DC.DrawLines(): argument 1 has unexpected type 'numpy.ndarray'

There's a lot of code duplication between test methods in this class.
It might be better to replace each "fccanvas" with "self.fccanvas", and then
do the common tearDown stuff like "self.fccanvas.Destroy()" in one place.
However, this commit aims to make minimal changes, hencing avoiding replacing
all instances of "fccanvas" with "self.fccanvas"
 2017-03-23 22:01:06 +11:00
James Wettenhall
79bd87a0e4 Skipping this test, because when the ToasterBox instance (tb) goes out of 
scope, the following exception is raised:

RuntimeError: super-class __init__() of type ToasterBox was never called
 2017-03-23 22:00:30 +11:00
James Wettenhall
15eca0a399 Monkey-patching RibbonGallery's Layout method avoids this exception: 
wx\lib\agw\ribbon\gallery.py, line 745, in Layout
    for item in self._items[indx:]:
UnboundLocalError: local variable 'indx' referenced before assignment

Monkey-patching RibbonGallery's OnPaint method avoids this exception:

wx\lib\agw\ribbon\gallery.py, line 587, in OnPaint
    dc.SetClippingRegion(self._client_rect)
AttributeError: 'RibbonGallery' object has no attribute '_client_rect'
 2017-03-23 21:59:09 +11:00
James Wettenhall
ff677ea1d5 Monkey-patch self.frame's PushEventHandler and PopEventHandler methods, 
because they don't behave well without a MainLoop.
 2017-03-23 21:57:54 +11:00
James Wettenhall
220b97f9e7 Explicitly calling ShowModal and Destroy avoids having WidgetTestCase's 
tlw.Close(force=True) trigger an exception because the dialog's EVT_CLOSE
handler is trying to call EndModal on a dialog which isn't modal.
 2017-03-23 21:55:22 +11:00
James Wettenhall
b678971bf4 Destroying date picker earlier avoids "R6025 - pure virtual function call". 2017-03-23 21:54:17 +11:00
Robin Dunn
9b743cf383 Remove the rest of the py34 stuff I missed last time 2017-03-22 21:51:28 -07:00
Robin Dunn
5292f96b23 Remove the builders for Python 3.4 2017-03-22 21:46:35 -07:00
Robin Dunn
5fec8821e7 Merge pull request #256 from RobinD42/fix-issue249 
Don't auto set mustHaveApp for all staticmethods of classes with the flag
 2017-03-22 09:45:12 -07:00
Robin Dunn
ad24b4ff79 Merge pull request #255 from wettenhj/VCForPython27 
Adding support for Microsoft Visual C++ Compiler for Python 2.7
 2017-03-21 19:24:23 -07:00
Robin Dunn
875c9677ac Revert auto-propagating the mustHaveAppFlag from classes to their static methods, if any, and explicitly set the flag on only those static methods that need it instead. 2017-03-21 19:21:07 -07:00
James Wettenhall
96dc809236 Adding support for Microsoft Visual C++ Compiler for Python 2.7 2017-03-22 08:40:05 +11:00
Robin Dunn
088ba0ccdf Merge pull request #254 from RobinD42/DLLs-for-Py36 
MSVC DLLs for Py36 builds
 2017-03-20 19:50:52 -07:00
Robin Dunn
14211ef913 Merge pull request #252 from RobinD42/fix-issue251 
Need to transfer ownership on the Prepend methods too.
 2017-03-20 19:50:37 -07:00
Robin Dunn
20f7f2dadd fix comment about the PYVER and the vcredist files 2017-03-20 16:39:58 -07:00
Robin Dunn
b1b759a17d Include the MSVC CRT DLLs for Python 3.6 builds too 2017-03-20 16:39:36 -07:00
Robin Dunn
632dcaba79 Need to transfer ownership on the Prepend methods too. 2017-03-20 16:35:21 -07:00
Robin Dunn
4fc5f9ed10 Merge pull request #239 from RobinD42/propgrid-more-fixes 
Lots of propgrid fixes
 2017-03-14 19:50:08 -07:00
Robin Dunn
a2d01de343 A few more iteritems —> items 2017-03-13 20:14:04 -07:00
Robin Dunn
3d0fb1927e Remove the MappedType for wxPGAttributeStorage 2017-03-13 19:59:54 -07:00
Robin Dunn
775d6da37a We can’t use the default SIP machinery got GetAttributes because wxPGAttributeStorage doesn’t have a copy-ctor and the default copy ctor won’t IncRef the variant values and so crashes happen. Just do the conversion directly here instead. 2017-03-13 19:48:58 -07:00
Robin Dunn
479d5b9db6 typos 2017-03-13 19:44:48 -07:00
Robin Dunn
539f9d1f82 Rename Properties and Items methods so the same-named properties don’t cause a build warning 2017-03-13 15:47:42 -07:00
Robin Dunn
76df4153bb propgrid demo tweaks 2017-03-11 20:25:25 -08:00
Robin Dunn
93005e5427 Add variant converters for wxColourPropertyValue 2017-03-11 20:14:51 -08:00
Robin Dunn
094ab1f710 Just convert wxPGAttributeStorage to a dictionary 2017-03-11 20:13:39 -08:00
Robin Dunn
c688fb0362 Port some Python code tweaks and extensions from Classic in propgrid 2017-03-11 19:05:13 -08:00
Robin Dunn
2b942551d9 Merge branch 'master' into propgrid-more-fixes 2017-03-09 09:52:47 -08:00
Robin Dunn
e3fbb9f1b8 Merge pull request #246 from RobinD42/fix-gtk2-cairo 
convert the context pointer to the proper type for cairocffi
 2017-03-07 19:32:45 -08:00
Robin Dunn
e83e3c7d5f convert the context pointer to the proper type for cairocffi 2017-03-07 19:19:44 -08:00
Robin Dunn
a92cef7bab Merge pull request #240 from radarhere/master 
Fixed typos
 2017-02-27 08:26:09 -08:00
Andrew Murray
2cfe4ad989 Fixed typos 2017-02-26 14:15:49 +11:00
Robin Dunn
97d138914c Use super() 2017-02-24 16:50:20 -08:00
Robin Dunn
8fcc3e3a5d minor demo tweaks 2017-02-24 16:09:47 -08:00
Robin Dunn
12c03571d2 Check for None/NULL before the other types. 2017-02-24 16:09:07 -08:00
Robin Dunn
918a70f5a4 Add mapped type for wxPGVariant and switch all wxVariant in propgrid to this type. This allows the variant types only available in propgrid to be used the same as the core variant types. 2017-02-24 14:32:40 -08:00
Robin Dunn
19930c9bbd Add support for more variant data types available in core. 2017-02-24 14:10:04 -08:00