Changeset 146 for trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI

Timestamp:

Jun 2, 2009, 5:40:15 PM (16 years ago)

Author:

lpino

Message:

• More work toward implementing Scale class

Location:

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

Files:

• library/swt.c (modified) (1 diff)
• org/eclipse/swt/internal/pm/OS.java (modified) (1 diff)

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

@@ -376 +376 @@
     if (pszName) releasePSZBytes(env, pszName, c_pszName);
     if (pszClass) releasePSZBytes(env, pszClass, c_pszClass);
+
+    return hwnd;
+}
+
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_pm_OS_WinCreateWindow__ILorg_eclipse_swt_internal_pm_PSZ_2Lorg_eclipse_swt_internal_pm_PSZ_2IIIIIIIILorg_eclipse_swt_internal_pm_SLDCDATA_2I
+        (JNIEnv *env, jclass that, jint hwndParent, jobject pszClass,
+            jobject pszName, jint flStyle, jint x, jint y, jint cx, jint cy, jint hwndOwner,
+            jint hwndInsertBehind, jint id, jobject pCtlData, jint pPresParams)
+{
+    PSZ c_pszClass = NULL;
+    PSZ c_pszName = NULL;
+    SLDCDATA c_pCtrlData, *c_ppCtrlData = NULL;
+    jint hwnd;
+
+    DEBUG_CALL("WinCreateWindow\n")
+
+    if (pszClass) c_pszClass = getPSZBytes(env, pszClass);
+    if (pszName) c_pszName = getPSZBytes(env, pszName);
+    if (pCtlData) 
+        c_ppCtrlData = getSLDCDATAFields(env, pCtlData, &c_pCtrlData, &PGLOB(SLDCDATAFc));
+
+
+    hwnd = (jint)WinCreateWindow((HWND)hwndParent, c_pszClass, c_pszName, flStyle,
+        x, y, cx, cy, hwndOwner, hwndInsertBehind, id, (PVOID)c_ppCtrlData, (PVOID)pPresParams);
+
+    if (pszName) releasePSZBytes(env, pszName, c_pszName);
+    if (pszClass) releasePSZBytes(env, pszClass, c_pszClass);
+    if (pCtlData)
+        setSLDCDATAFields(env, pCtlData, c_ppCtrlData, &PGLOB(SLDCDATAFc));    
 
     return hwnd;

trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java

@@ -2240 +2240 @@
     PSZ pszName, int flStyle, int x, int y, int cx, int cy, int hwndOwner,
     int hwndInsertBehind, int id, int pCtlData, int pPresParams);
+public static final native int WinCreateWindow (int hwndParent, PSZ pszClass,
+    PSZ pszName, int flStyle, int x, int y, int cx, int cy, int hwndOwner,
+    int hwndInsertBehind, int id, SLDCDATA pCtlData, int pPresParams);
 public static final native boolean WinDestroyWindow (int hwnd);
 public static final native int WinDefWindowProc (int hwnd, int ulMsgid,