Re: Regression in build 1964, AddGrowableCol fails

That is a good fix on Win7, Py2.7 x64, thank you, sir.

Now if I could only figure out why all my Grid stuff is segfaulting all
over the place...


On Fri, Apr 15, 2016 at 6:24 PM, Eric Fahlgren <[email protected]>
wrote:

> Never mind. :)  I added --whitespace=fix and it seems to have applied.
>
> On Fri, Apr 15, 2016 at 6:16 PM, Eric Fahlgren <[email protected]>
> wrote:
>
>> I can't get the patch to work, my git-fu is lacking as I almost never use
>> it.  What am I doing wrong here?
>>
>> > git apply fix-wacky-ints.patch
>> fix-wacky-ints.patch:31: trailing whitespace.
>>         #if PY_MAJOR_VERSION >= 3
>> fix-wacky-ints.patch:32: trailing whitespace.
>>             *sipCppPtr = new size_t(PyLong_AsSize_t(sipPy));
>> fix-wacky-ints.patch:35: trailing whitespace.
>>             *sipCppPtr = new
>> size_t(static_cast<size_t>(PyInt_AsUnsignedLongLongMask(sipPy)));
>> fix-wacky-ints.patch:43: trailing whitespace.
>>         #if PY_MAJOR_VERSION >= 3
>> fix-wacky-ints.patch:44: trailing whitespace.
>>             return PyLong_FromSize_t(*sipCpp);
>> error: patch failed: src/wacky_ints.sip:19
>> error: src/wacky_ints.sip: patch does not apply
>>
>> > git show
>> commit f780b216881e6afd81584ae49453630734e023c5
>> Merge: aab2833 23e69cb
>> Author: Robin Dunn <[email protected]>
>> Date:   Wed Mar 9 21:10:31 2016 -0800
>>
>>     Merge pull request #48 from RobinD42/wacky-int-types
>>
>>     Wacky int types
>>
>> > git status
>> On branch master
>> Your branch is up-to-date with 'origin/master'.
>>
>> Changes not staged for commit:
>>   (use "git add <file>..." to update what will be committed)
>>   (use "git checkout -- <file>..." to discard changes in working
>> directory)
>>   (commit or discard the untracked or modified content in submodules)
>>
>>         modified:   ext/wxWidgets (modified content, untracked content)
>>         modified:   wx/lib/agw/aui/framemanager.py
>> ... some other wx/lib hacks
>>         modified:   wx/py/shell.py
>>
>> Untracked files:
>>   (use "git add <file>..." to include in what will be committed)
>>
>>         .nobackup
>>         fix-wacky-ints.patch
>>
>> no changes added to commit (use "git add" and/or "git commit -a")
>>
>>
>> On Fri, Apr 15, 2016 at 6:05 PM, Eric Fahlgren <[email protected]>
>> wrote:
>>
>>> Good timing, Scott.  Just happens that I cloned the repo and got it to
>>> build last night (albeit with a hack to distutils to use VC 10.0 instead of
>>> 9.0, which may be sending me to dll hell, but whatever -- I am seeing
>>> various segfaults that I don't think I've seen before).
>>> I'll give it a try and let you know.
>>>
>>> Eric
>>>
>>>
>>> On Fri, Apr 15, 2016 at 6:01 PM, Scott Talbert <[email protected]> wrote:
>>>
>>>> It turns out that this was more complicated than I expected.  Do you
>>>> happen to have a dev environment where you could test this patch on Win64?
>>>> I believe it should solve the problems but I don't have a Win environment
>>>> readily available.
>>>>
>>>> Scott
>>>>
>>>> On Wed, 13 Apr 2016, Eric Fahlgren wrote:
>>>>
>>>> On Wed, Apr 13, 2016 at 3:54 PM, Scott Talbert <[email protected]> wrote:
>>>>>       And you're using the 64-bit compiled version, right?
>>>>>
>>>>>
>>>>> Oops, forgot to say that... Correct: all 64-bit, all the time.
>>>>>
>>>>> I do a "pip download", check that the version looks correct, then
>>>>> install
>>>>> the local wheel into my venv.
>>>>>
>>>>> wxPython_Phoenix-3.0.3.dev1943+fdf739f-cp27-cp27m-win_amd64.whl
>>>>> wxPython_Phoenix-3.0.3.dev1964+f780b21-cp27-cp27m-win_amd64.whl
>>>>>
>>>>> --
>>>>> You received this message because you are subscribed to the Google
>>>>> Groups
>>>>> "wxPython-dev" group.
>>>>> To unsubscribe from this group and stop receiving emails from it, send
>>>>> an
>>>>> email to [email protected].
>>>>> For more options, visit https://groups.google.com/d/optout.
>>>>>
>>>>>
>>>
>>
>

-- 
You received this message because you are subscribed to the Google Groups "wxPython-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
For more options, visit https://groups.google.com/d/optout.