Magnus Hagander a écrit :
> Guillaume Lelarge wrote:
>>> The hotkey stuff I was working on already, but I'll just use your patch
>>> instead. It seems to be working fine in on my machine as well, so I'll
>>> go ahead and commit it. One thing first though...
>>>
>>> When I ran embed-xrc, I got a diff containing:
>>> Index: ui/xrcDialogs.cpp
>>> ===================================================================
>>> --- ui/xrcDialogs.cpp (revision 7394)
>>> +++ ui/xrcDialogs.cpp (working copy)
>>> @@ -13,6 +13,14 @@
>>> #include <wx/xrc/xmlres.h>
>>> #include <wx/xrc/xh_all.h>
>>>
>>> +#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805
>>> + #define XRC_ADD_FILE(name, data, size, mime) \
>>> + wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)
>>> +#else
>>> + #define XRC_ADD_FILE(name, data, size, mime) \
>>> + wxMemoryFSHandler::AddFile(name, data, size)
>>> +#endif
>>> +
>>>
>>> Is that normal? Or am I using something that I shouldn't be using? Don't
>>> want to do anything until that's confirmed :)
>>>
>> I don't have this on my "svn diff", but I do have these lines on my
>> xrcDialog.cpp file. Are you sure your svn copy is uptodate ?
>
> Ah, I get it. I get them in the svn diff in the *backbranch*, but not in
> HEAD.... Are we using different versions of wx to build these two?
>
You're right. I was only working on trunk. On 1.8 branch, I have the
same "svn diff" than you. I don't think we change the wxWidgets toolkit.
I use the --with-wx flag to work on wxWidgets 2.8.8, on the 1.8 branch
and on trunk. I don't know what ./embed-xrc script will do if I was
using a wxWidgets older than 2.8.5.
Anyways, we should built against wxWidgets 2.8.8 because of the GTK
patch they add on this release that fixes our shortcuts on contextual menus.
So, +1 to commit your diff.
--
Guillaume.
http://www.postgresqlfr.org
http://dalibo.com