Changeset 146 for trunk/src

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

Files:

• Eclipse SWT PI/pm/library/swt.c (modified) (1 diff)
• Eclipse SWT PI/pm/org/eclipse/swt/internal/pm/OS.java (modified) (1 diff)
• Eclipse SWT/pm/org/eclipse/swt/widgets/Scale.java (modified) (5 diffs)

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,

trunk/src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Scale.java

@@ -1 +1 @@
 package org.eclipse.swt.widgets;
+
+/*
+ * OS/2 version.
+ * Copyright (c) 2002, 2009 EclipseOS2 Team.
+ */
 
 /*
@@ -33 +38 @@
 
 public class Scale extends Control {
-        static final int TrackBarProc =0;
-//      static final TCHAR TrackBarClass = new TCHAR (0, OS.TRACKBAR_CLASS, true);
+        static final int TrackBarProc;
         static final PSZ TrackBarClass = PSZ.getAtom (OS.WC_SLIDER);
-//      static {
-//              WNDCLASS lpWndClass = new WNDCLASS ();
-//              OS.GetClassInfo (0, TrackBarClass, lpWndClass);
-//              TrackBarProc = lpWndClass.lpfnWndProc;
-//      }
+        static {
+                CLASSINFO lpWndClass = new CLASSINFO ();
+                OS.WinQueryClassInfo (OS.NULLHANDLE, TrackBarClass, lpWndClass);
+                TrackBarProc = lpWndClass.pfnWindowProc;
+        }
 
 /**
@@ -72 +76 @@
  */
 public Scale (Composite parent, int style) {
-//      super (parent, checkStyle (style));
+        super (parent, checkStyle (style));
 }
 
@@ -94 +98 @@
  * @see #removeSelectionListener
  */
-//public void addSelectionListener(SelectionListener listener) {
-//      checkWidget ();
-//      if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
-//      TypedListener typedListener = new TypedListener (listener);
-//      addListener (SWT.Selection,typedListener);
-//      addListener (SWT.DefaultSelection,typedListener);
-//}
-//
+public void addSelectionListener(SelectionListener listener) {
+        checkWidget ();
+        if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+        TypedListener typedListener = new TypedListener (listener);
+        addListener (SWT.Selection,typedListener);
+        addListener (SWT.DefaultSelection,typedListener);
+}
+
 int callWindowProc (int msg, int mp1, int mp2) {
         if (handle == 0) return 0;
         return OS.WinCallWindowProc(TrackBarProc, handle, msg, mp1, mp2);
 }
-//
-//static int checkStyle (int style) {
-//      return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
-//}
-//
+
+static int checkStyle (int style) {
+        return checkBits (style, SWT.HORIZONTAL, SWT.VERTICAL, 0, 0, 0, 0);
+}
+
 //public Point computeSize (int wHint, int hHint, boolean changed) {
 //      checkWidget ();
@@ -130 +134 @@
 //      return new Point (width, height);
 //}
-//
-//void createHandle () {
-//      super.createHandle ();
+
+void createHandle () {
+        super.createHandle ();
 //      OS.SendMessage (handle, OS.TBM_SETRANGEMAX, 0, 100);
 //      OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, 10);
 //      OS.SendMessage (handle, OS.TBM_SETTICFREQ, 10, 0);
-//}
-//
-//int defaultForeground () {
-//      return OS.GetSysColor (OS.COLOR_BTNFACE);
-//}
-//
+}
+
+int defaultForeground () {
+        return OS.WinQuerySysColor(handle, OS.SYSCLR_SCROLLBAR, 0);
+}
+
 ///**
 // * Returns the amount that the receiver's value will be