From db43ed72fe0eaaeca48c43176022191a39a94566 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Thu, 20 Dec 2018 06:47:11 -0700 Subject: [PATCH] swig: clear up some warnings --- common/swig/kicad.i | 5 ++++- common/swig/math.i | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/swig/kicad.i b/common/swig/kicad.i index 0b17e7b976..e11cdb86d3 100644 --- a/common/swig/kicad.i +++ b/common/swig/kicad.i @@ -104,7 +104,6 @@ principle should be easily implemented by adapting the current STL containers. %ignore GetNewConfig; // header files that must be wrapped - %include macros.h %include core/typeinfo.h %include base_struct.h @@ -112,6 +111,7 @@ principle should be easily implemented by adapting the current STL containers. %include common.h %include title_block.h %include gal/color4d.h +%include core/settings.h %include colors_design_settings.h %include marker_base.h %include eda_text.h @@ -138,6 +138,8 @@ typedef long time_t; // Contains VECTOR2I %include math.i +// ignore warning from nested classes +#pragma SWIG nowarn=325 %ignore SHAPE_LINE_CHAIN::convertFromClipper; #include %include @@ -151,6 +153,7 @@ typedef long time_t; // Rename operators defined in utf8.h %rename(utf8_to_charptr) operator char* () const; %rename(utf8_to_wxstring) operator wxString () const; +%rename(utf8_to_string) operator const std::string& () const; #include %include diff --git a/common/swig/math.i b/common/swig/math.i index a8b9ad389c..8a3e36e3ff 100644 --- a/common/swig/math.i +++ b/common/swig/math.i @@ -29,6 +29,8 @@ %ignore VECTOR2::ECOORD_MAX; %ignore VECTOR2::ECOORD_MIN; + +%rename(getWxPoint) operator wxPoint; #include %include %template(VECTOR2I) VECTOR2;