Changeset 174 for trunk/src

Timestamp:

Aug 3, 2009, 3:37:38 AM (16 years ago)

Author:

lpino

Message:

• New POINTS struct

Location:

trunk/src/plugins

Files:

• org.eclipse.swt.pm/classes.inc (modified) (2 diffs)
• org.eclipse.swt/Eclipse SWT PI/pm/library/structs.c (modified) (3 diffs)
• org.eclipse.swt/Eclipse SWT PI/pm/library/structs.h (modified) (3 diffs)

trunk/src/plugins/org.eclipse.swt.pm/classes.inc

@@ -47 +47 @@
 org\eclipse\swt\widgets\MenuItem.java
 org\eclipse\swt\widgets\Scale.java
+
 # SWT Base
 
@@ -200 +201 @@
 org\eclipse\swt\internal\pm\CURSORINFO.java
 org\eclipse\swt\internal\pm\SLDCDATA.java
+org\eclipse\swt\internal\pm\POINTS.java
 
 # SWT PI (+)

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/structs.c

@@ -1 +1 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2008 EclipseOS2 Team.
+ * Copyright (c) 2002, 2009 EclipseOS2 Team.
  */
 
@@ -175 +175 @@
 POINTL_FID_CACHE POINTLFc;
 SLDCDATA_FID_CACHE SLDCDATAFc;
+POINTS_FID_CACHE POINTSFc;
 
 /*@@TODO (dmik): remove
@@ -1627 +1628 @@
 }
 
+/***************************************** POINTS struct ***************************************/
+
+void cachePOINTSFids(JNIEnv *env, jobject lpObject, PPOINTS_FID_CACHE lpCache)
+{
+    if (lpCache->cached) return;
+    lpCache->clazz = (*env)->GetObjectClass(env, lpObject);
+    lpCache->x = (*env)->GetFieldID(env, lpCache->clazz, "x", "S");
+    lpCache->y = (*env)->GetFieldID(env, lpCache->clazz, "y", "S");
+    lpCache->cached = 1;
+}
+
+PPOINTS getPOINTSFields(JNIEnv *env, jobject lpObject, PPOINTS lpStruct, PPOINTS_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cachePOINTSFids(env, lpObject, lpCache);
+    lpStruct->x = (*env)->GetShortField(env, lpObject, lpCache->x);
+    lpStruct->y = (*env)->GetShortField(env, lpObject, lpCache->y);
+    return lpStruct;
+}
+
+void setPOINTSFields(JNIEnv *env, jobject lpObject, PPOINTS lpStruct, PPOINTS_FID_CACHE lpCache)
+{
+    if (!lpCache->cached) cachePOINTSFids(env, lpObject, lpCache);
+    (*env)->SetShortField(env, lpObject, lpCache->x, lpStruct->x);
+    (*env)->SetShortField(env, lpObject, lpCache->y, lpStruct->y);
+}
 
 /***************************************** FACENAMEDESC struct ********************************************/

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/structs.h

@@ -1 +1 @@
 /*
  * OS/2 version.
- * Copyright (c) 2002, 2008 EclipseOS2 Team.
+ * Copyright (c) 2002, 2009 EclipseOS2 Team.
  */
 
@@ -583 +583 @@
 void setSLDCDATAFields(JNIEnv *env, jobject lpObject, PSLDCDATA lpStruct, PSLDCDATA_FID_CACHE lpCache);
 
+/* POINTS struct */
+typedef struct POINTS_FID_CACHE {
+    int cached;
+    jclass clazz;
+    jfieldID
+        x,        
+        y;        
+} POINTS_FID_CACHE;
+typedef POINTS_FID_CACHE *PPOINTS_FID_CACHE;
+
+void cachePOINTSFids(JNIEnv *env, jobject lpObject, PPOINTS_FID_CACHE lpCache);
+PPOINTS getPOINTSFields(JNIEnv *env, jobject lpObject, PPOINTS lpStruct, PPOINTS_FID_CACHE lpCache);
+void setPOINTSFields(JNIEnv *env, jobject lpObject, PPOINTS lpStruct, PPOINTS_FID_CACHE lpCache);
 
 /* FACENAMEDESC struct */
@@ -630 +643 @@
 extern POINTL_FID_CACHE POINTLFc;
 extern SLDCDATA_FID_CACHE SLDCDATAFc;
+extern POINTS_FID_CACHE POINTSFc;
 /*@@TODO (dmik): remove! 
 extern FACENAMEDESC_FID_CACHE FACENAMEDESCFc;