X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-sharp%2Fdali-bindings%2Fkeyboard_focus_manager_wrap.cpp;h=958375848848af0743c447925bc8c4791c73aab5;hp=78c5c0bcc3f21a58cefe4641b66d1999ac618be1;hb=7cca1061ed3db08d2e7f511a8f6ef707e688703d;hpb=82e6a46b87c64df1be36cf414f6e94f9d17d52ff

diff --git a/plugins/dali-sharp/dali-bindings/keyboard_focus_manager_wrap.cpp b/plugins/dali-sharp/dali-bindings/keyboard_focus_manager_wrap.cpp
index 78c5c0b..9583758 100644
--- a/plugins/dali-sharp/dali-bindings/keyboard_focus_manager_wrap.cpp
+++ b/plugins/dali-sharp/dali-bindings/keyboard_focus_manager_wrap.cpp
@@ -623,16 +623,32 @@ SWIGEXPORT unsigned long SWIGSTDCALL CSharp_KeyboardPreFocusChangeSignal_GetConn
   return jresult;
 }
 
-typedef void* (SWIGSTDCALL* SWIG_CallbackKbPreFocusChange)(void *, void *, int);
+typedef Dali::Actor * (SWIGSTDCALL* SWIG_CallbackKbPreFocusChange)(Dali::Actor *, Dali::Actor *, int);
 SWIG_CallbackKbPreFocusChange swig_callbackOnKbPreFocusChange;
 
 Dali::Actor OnKbPreFocusChangeCallback(Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocus::Direction direction)
 {
     Dali::Actor *actorp;
     Dali::Actor actor;
+    Dali::Actor *CurrentP = NULL;
+    Dali::Actor *ProposedP = NULL;
 
-    actorp = (Dali::Actor *)swig_callbackOnKbPreFocusChange((void *)&current, (void *)&proposed, direction);
-    actor = *actorp;
+    if (current)
+    {
+      CurrentP = (Dali::Actor *)&current;
+    }
+
+    if (proposed)
+    {
+      ProposedP = (Dali::Actor *)&proposed;
+    }
+
+    actorp = (Dali::Actor *)swig_callbackOnKbPreFocusChange(CurrentP, ProposedP, direction);
+
+    if (actorp)
+    {
+      actor = *actorp;
+    }
 
     return actor;
 }