← Back to team overview

kicad-developers team mailing list archive

Re: About dialog

 

Le 05/03/2016 18:48, jp charras a écrit :
> Le 05/03/2016 17:57, Nick Østergaard a écrit :
>> I tested the patch on windows x86_64 the other day and did not see any
>> issue. But I am not sure that was the latest version of the patch.
>> Den 05/03/2016 17.41 skrev "jp charras" <jp.charras@xxxxxxxxxx>:
>>
>>> Le 05/03/2016 17:27, Simon Wells a écrit :
>>>> Hey jp
>>>>
>>>> Have you tested it on any other platforms and thats the only one its
>>>> crashed on or is that your only test? I will check to see why the
>>>> patch didn't apply as thats rather odd as it was bzr diff'd off 6606.
>>>>
>>>> I wonder if it is an issue with wx3.1 as i am still deving on 3.0.2
>>>> but thanks for the report
>>>
>>>
>>> This is bit strange.
>>> I just made a fast test only on W7 32 bits.
>>>
>>> I switched on wxWidgets 3.1, now released, due to a bug (related to
>>> mouse wheel event) never correctly fixed in 3.0x, but fixed since a long
>>> time ago in 3.1 dev branch.
>>>
> 
> The crash was due to a (incorrect) fix I made due to avoid this warning:
> 
> In file included from C:/msys32_mywx/mingw32/include/curl/curlbuild.h:123:0,
>                  from C:/msys32_mywx/mingw32/include/curl/curl.h:34,
>                  from
> E:/kicad-launchpad/mytesting/include/kicad_curl/kicad_curl.h:44,
>                  from
> E:/kicad-launchpad/mytesting/common/dialog_about/dialog_about.cpp:48:
> C:/msys32_mywx/mingw32/i686-w64-mingw32/include/winsock2.h:15:2:
> warning: #warning Please include winsock2.h before windows.h [-Wcpp]
>  #warning Please include winsock2.h before windows.h
>   ^
> 
> But the warning (usual with curl.h, already encountered in other .cpp
> files which include curl.h) must be fixed
> 
> Sorry.
> 
> 
To fix this issue, just include kicad_curl.h at the beginning of
dialog_about.cpp:

Here is my fix:

#include <config.h>

#ifdef BUILD_GITHUB_PLUGIN
// kicad_curl.h must be included before wx headers, to avoid
// conflicts for some defines, at least on Windows
#include <kicad_curl/kicad_curl.h>
#endif


-- 
Jean-Pierre CHARRAS


Follow ups

References