Reduce bloat by not implementing wrapped data

The definition of the wrapped classes is needed in several places, such
as easyaccess, but they don't need the Python definition.

Author: jim-easterbrook

src/interface/easyaccess.i

@@ -22,7 +22,7 @@
 #ifndef SWIGIMPORTED
 // Get definition of ExifDataWrap so functions can be passed
 // either ExifDataWrap or Exiv2::ExifData
-DATA_WRAPPER(ExifData, Exiv2::ExifData, Exiv2::Exifdatum, Exiv2::ExifKey)
+DATA_WRAPPER_DEC(ExifData, Exiv2::ExifData, Exiv2::Exifdatum, Exiv2::ExifKey)
 #endif
 
 // Store data.end() after converting input

src/interface/exif.i

@@ -43,7 +43,7 @@ DATA_ITERATOR(ExifData, Exiv2::ExifData, Exiv2::ExifData::iterator,
               Exiv2::Exifdatum)
 // Get definition of ExifDataWrap so ExifThumb constructor can be passed
 // either ExifDataWrap or Exiv2::ExifData
-DATA_WRAPPER(ExifData, Exiv2::ExifData, Exiv2::Exifdatum, Exiv2::ExifKey)
+DATA_WRAPPER_DEC(ExifData, Exiv2::ExifData, Exiv2::Exifdatum, Exiv2::ExifKey)
 #endif
 
 %ignore Exiv2::ExifData::operator[];

src/interface/preamble.i

@@ -252,8 +252,9 @@ public:
 %}
 %enddef // DATA_ITERATOR
 
-// Macro to wrap data while keeping a reference to its image
-%define DATA_WRAPPER(name, base_class, datum_type, key_type)
+// Macros to wrap data while keeping a reference to its image
+// Macro that actually does everything, either declaration only or implemented
+%define _DATA_WRAPPER(name, base_class, datum_type, key_type, mode)
 // Allow name##Wrap to be passed where base_class is expected
 %typemap(in) base_class& (int res, name##Wrap* arg_wrap, base_class* arg_base) %{
     res = SWIG_ConvertPtr($input, (void**)&arg_wrap, $descriptor(name##Wrap*), 0);
@@ -288,7 +289,7 @@ public:
 %feature("docstring") name##Wrap
     "Python wrapper for "#base_class
     ".\nSee that class's documentation for full details."
-%inline %{
+mode %{
 class name##Wrap {
 private:
     base_class* base;
@@ -331,6 +332,16 @@ public:
     }
 };
 %}
+%enddef // _DATA_WRAPPER
+
+// Macro to declare wrapped class for C++ use but not for Python
+%define DATA_WRAPPER_DEC(name, base_class, datum_type, key_type)
+_DATA_WRAPPER(name, base_class, datum_type, key_type, )
+%enddef // DATA_WRAPPER_DEC
+
+// Macro to declare wrapped class for Python and C++
+%define DATA_WRAPPER(name, base_class, datum_type, key_type)
+_DATA_WRAPPER(name, base_class, datum_type, key_type, %inline)
 %enddef // DATA_WRAPPER
 
 // Macro to make enums more Pythonic

src/swig_0.26/easyaccess.py

@@ -63,4 +63,3 @@ class _SwigNonDynamicMeta(type):
 
 
 
-