Merge "DALi C# binding - Write pure C# Color & Position classes and use typemaps...

diff --combined plugins/dali-swig/Makefile.am
index 6b6966a,a7528d4..0e66bee
--- 1/plugins/dali-swig/Makefile.am
--- 2/plugins/dali-swig/Makefile.am
+++ b/plugins/dali-swig/Makefile.am
@@@ -23,8 -23,8 +23,8 @@@ if BUILD_MC
  
  all-local: libNDalic.so NDali.dll
  
 -libNDalic.so: automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o
 -      g++ -shared automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o -o libNDalic.so $(DALICORE_LIBS) $(DALIADAPTOR_LIBS) $(DALITOOLKIT_LIBS)
 +libNDalic.so: automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o
 +      g++ -shared automatic/cpp/dali_wrap.o manual/cpp/keyboard_focus_manager_wrap.o manual/cpp/view-wrapper-impl-wrap.o manual/cpp/callbackbase_wrap.o -o libNDalic.so $(DALICORE_LIBS) $(DALIADAPTOR_LIBS) $(DALITOOLKIT_LIBS)
  
  automatic/cpp/dali_wrap.o: $(BUILT_SOURCES)
        g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) automatic/cpp/dali_wrap.cpp -o automatic/cpp/dali_wrap.o
@@@ -32,20 -32,12 +32,20 @@@
  manual/cpp/keyboard_focus_manager_wrap.o: $(BUILT_SOURCES)
        g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/keyboard_focus_manager_wrap.cpp -o manual/cpp/keyboard_focus_manager_wrap.o
  
 +manual/cpp/view-wrapper-impl-wrap.o: $(BUILT_SOURCES)
 +      g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/view-wrapper-impl-wrap.cpp -o manual/cpp/view-wrapper-impl-wrap.o
 +
 +manual/cpp/callbackbase_wrap.o: $(BUILT_SOURCES)
 +      g++ -c -fpic $(CXXFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) manual/cpp/callbackbase_wrap.cpp -o manual/cpp/callbackbase_wrap.o
 +
  NDali.dll: $(BUILT_SOURCES)
        $(MCS) -nologo -target:library -out:NDali.dll automatic/csharp/*.cs manual/csharp/*.cs
  
  check-local: examples/dali-test.exe \
               examples/hello-world.exe \
               examples/scroll-view.exe \
 +             examples/custom-control.exe \
 +             examples/spin-control.exe \
               examples/libNDalic.so examples/NDali.dll
  
  examples/%.exe: examples/%.cs
@@@ -66,7 -58,6 +66,6 @@@ $(BUILT_SOURCES): SWIG/*.
        rm -f automatic/csharp/*.cs
        $(SWIG) -csharp -c++ -outdir automatic/csharp \
              $(DALI_CFLAGS) $(DALICORE_CFLAGS) $(DALIADAPTOR_CFLAGS) $(DALITOOLKIT_CFLAGS) -namespace Dali -o automatic/cpp/dali_wrap.cpp SWIG/dali.i
-       ./property-wrapper.rb
        ./constructor-generator.rb
  
  dist-hook: $(BUILT_SOURCES)

diff --combined plugins/dali-swig/SWIG/dali.i
index fdcd4b2,54d692e..79e987b
--- 1/plugins/dali-swig/SWIG/dali.i
--- 2/plugins/dali-swig/SWIG/dali.i
+++ b/plugins/dali-swig/SWIG/dali.i
@@@ -25,7 -25,6 +25,7 @@@
  #endif
  
  %include exception.i
 +%include dali-gc.i
  
  %exception {
      try {
@@@ -65,7 -64,6 +65,7 @@@
  #include <dali-toolkit/devel-api/builder/builder.h>
  
  #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 +
  #include <dali-toolkit/devel-api/controls/popup/popup.h>
  #include <dali-toolkit/devel-api/controls/progress-bar/progress-bar.h>
  #include <dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h>
@@@ -165,6 -163,7 +165,7 @@@
  
  #endif
  
+ 
  %ignore operator<<;
  %ignore *::GetImplementation();
  %ignore *::GetImplementation(Dali::BaseHandle&);
@@@ -174,7 -173,10 +175,7 @@@ using namespace Dali
  using namespace Dali::Toolkit;
  %}
  
 -//%feature("director") Dali::Internal::CustomActorImpl;
 -//%feature("notabstract") Dali::Internal::CustomActorImpl;
 -//%feature("director") Dali::Toolkit::Internal::Control;
 -//%feature("notabstract") Dali::Toolkit::Internal::Control;
 +%feature("director") Dali::Toolkit::Internal::Control;
  %feature("notabstract") Dali::Toolkit::FixedRuler;
  %feature("notabstract") Dali::Toolkit::DefaultRuler;
  
@@@ -215,8 -217,27 +216,27 @@@
  %include events/textfield-event.i
  %include events/timer-event.i
  %include events/videoview-event.i
+ %include events/rendertask-event.i
  
  %include alphafunction.i
+ %include cameraActor.i
+ %include flexContainer.i
+ %include imageView.i
+ %include layer.i
+ %include linearConstrainer.i
+ %include model3DView.i
+ %include path.i
+ %include pathConstrainer.i
+ %include progressBar.i
+ %include pushButton.i
+ %include renderer.i
+ %include shader.i
+ %include tableView.i
+ %include textLabel.i
+ 
+ %include propertyValue.i
+ %include pageTurnLandscapeView.i
+ %include pageTurnPortraitView.i
  
  %include dali-operator.i
  %include dali-core.i