javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/slotcallback.cpp
changeset 35 85266cc22c7f
parent 21 2a9601315dfc
child 87 1627c337e51e
--- a/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/slotcallback.cpp	Thu May 27 12:49:31 2010 +0300
+++ b/javauis/eswt_qt/org.eclipse.swt/Eclipse_SWT_PI/qt/library/slotcallback.cpp	Fri Jun 11 13:33:44 2010 +0300
@@ -21,9 +21,9 @@
 #include "QListWidgetItem"
 
 #include "slotcallback.h"
-#include "swt.h"
 #include "jniutils.h"
 #include "swtapplication.h"
+#include "swtlog.h"
 
 using namespace Java::eSWT;
 
@@ -38,7 +38,7 @@
 
     // If Java peer is not Display then jobject ref and methodID are needed.
     // Otherwise they are managed by JniUtils.
-    if (!swtApp->jniUtils().isDisplay(aPeer))
+    if (aPeer != NULL)
     {
         mPeer = aJniEnv->NewGlobalRef(aPeer);
         if(!mPeer)
@@ -70,7 +70,7 @@
     if (mPeer)
     {
         // Call non-Display peer using our own jobject ref and jmethodID
-        jniUtils.eventProcess(mPeer, mJmethod, reinterpret_cast<int>(parent()), mSignalId, a1, a2, a3, a4, a5, aString);
+        jniUtils.eventProcess(mPeer, mJmethod, parent(), mSignalId, a1, a2, a3, a4, a5, aString);
     }
     else
     {