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? //Magnus -- Sent via pgadmin-hackers mailing list ([email protected]) To make changes to your subscription: http://www.postgresql.org/mailpref/pgadmin-hackers
