Changeset 149

Timestamp:

06/09/2009 21:05:52 (14 months ago)

Author:

lpino

Message:

- First working examples with correct initial styles

Location:

trunk

Files:

• src/plugins/org.eclipse.swt/Eclipse SWT PI/pm/library/swt.c (modified) (2 diffs)
• src/plugins/org.eclipse.swt/Eclipse SWT/pm/org/eclipse/swt/widgets/Scale.java (modified) (6 diffs)
• tests/SWT/java/SWT009_09.java (modified) (1 diff)

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

@@ -357 +357 @@
 }
 
-JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_pm_OS_WinCreateWindow
+JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_pm_OS_WinCreateWindow__ILorg_eclipse_swt_internal_pm_PSZ_2Lorg_eclipse_swt_internal_pm_PSZ_2IIIIIIIIII
         (JNIEnv *env, jclass that, jint hwndParent, jobject pszClass,
             jobject pszName, jint flStyle, jint x, jint y, jint cx, jint cy, jint hwndOwner,
@@ -396 +396 @@
     if (pCtlData) 
         c_ppCtrlData = getSLDCDATAFields(env, pCtlData, &c_pCtrlData, &PGLOB(SLDCDATAFc));
-
 
     hwnd = (jint)WinCreateWindow((HWND)hwndParent, c_pszClass, c_pszName, flStyle,

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

@@ -80 +80 @@
     this.style = style;
     SLDCDATA sldcData = new SLDCDATA();
+    sldcData.usScale1Increments = 10;
+    //sldcData.usScale2Increments = 10;
+    sldcData.usScale1Spacing = 0;
+    //sldcData.usScale2Spacing = 0;
     handle = OS.WinCreateWindow (
         parent.handle,
@@ -90 +94 @@
         OS.HWND_BOTTOM, //OS.HWND_TOP,
         0,
-        0,
+        sldcData,
         0
     );
-// System.out.println("Class = " + windowClass ());
-//@@TODO (lpino): Remove
-//    System.out.println("ERROR = " + OS.WinGetLastError(parent.getDisplay ().hab));
     if (handle == 0) error (SWT.ERROR_NO_HANDLES);
     OS.WinSetWindowUShort (handle, OS.QWS_ID, (short)(handle & 0xFFFF));
 
-//@@TODO (dmik): debug code, remove when no more necessary 
-System.out.println (
-    "Scale(parent, style): Scale has been created:\n" +
-    "    hwnd = " + Integer.toHexString (handle) + "\n" +
-    "    hwnd.parent = hwnd.owner = " + Integer.toHexString (parent.handle) + "\n" +
-    "    class = " + windowClass() + "\n" +
-    "    style = " + Integer.toHexString (widgetStyle())
-    );
+    OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)2), 0);
     super.register ();
     super.subclass ();
@@ -172 +166 @@
 
 void createHandle () {
+    System.out.println ("Scale:createHandle");
         super.createHandle ();
+        OS.WinSendMsg(handle, OS.SLM_SETTICKSIZE, OS.MPFROM2SHORT((short)OS.SMA_SETALLTICKS, (short)10), 0);       
 //      OS.SendMessage (handle, OS.TBM_SETRANGEMAX, 0, 100);
 //      OS.SendMessage (handle, OS.TBM_SETPAGESIZE, 0, 10);
@@ -194 +190 @@
 // * </ul>
 // */
-//public int getIncrement () {
-//      checkWidget ();
+public int getIncrement () {
+        checkWidget ();
+        return OS.WinSendMsg(handle, OS.SLM_QUERYSLIDERINFO, OS.MPFROM2SHORT((short)OS.SMA_SLIDERARMPOSITION, (short)OS.SMA_INCREMENTVALUE), 0);
 //      return OS.SendMessage (handle, OS.TBM_GETLINESIZE, 0, 0);
-//}
-//
+}
+
 ///**
 // * Returns the maximum value which the receiver will allow.
@@ -278 +275 @@
 // * @see #addSelectionListener
 // */
-//public void removeSelectionListener(SelectionListener listener) {
-//      checkWidget ();
-//      if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
-//      if (eventTable == null) return;
-//      eventTable.unhook (SWT.Selection, listener);
-//      eventTable.unhook (SWT.DefaultSelection,listener);      
-//}
-//
+public void removeSelectionListener(SelectionListener listener) {
+        checkWidget ();
+        if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);
+        if (eventTable == null) return;
+        eventTable.unhook (SWT.Selection, listener);
+        eventTable.unhook (SWT.DefaultSelection,listener);      
+}
+
 ///**
 // * Sets the amount that the receiver's value will be
@@ -390 +387 @@
 //
 int widgetStyle () {
-        int bits = super.widgetStyle () | OS.SLS_CENTER | OS.SLS_HOMELEFT | OS.SLS_PRIMARYSCALE1 | OS.SLS_PRIMARYSCALE2;
-        if ((style & SWT.VERTICAL) != 0) return bits | OS.SLS_VERTICAL;
+        int bits = super.widgetStyle () | OS.SLS_CENTER | OS.SLS_HOMELEFT | OS.SLS_PRIMARYSCALE1;
+        if ((style & SWT.VERTICAL) != 0) return bits | OS.SLS_VERTICAL | OS.SLS_HOMETOP;
         return bits;
 }

trunk/tests/SWT/java/SWT009_09.java

@@ -32 +32 @@
         void initComponents() {
             Scale scaleH = new Scale(shell, SWT.NULL);
-//            Scale scaleV = new Scale(shell, SWT.VERTICAL);
+            Scale scaleV = new Scale(shell, SWT.VERTICAL);
 //
-//            scaleH.setBounds(0, 0, 100, 50);
-//            scaleV.setBounds(0, 50, 50, 100);
+            scaleH.setBounds(0, 0, 100, 50);
+            scaleV.setBounds(0, 50, 50, 100);
 //
 //            System.out.println("Min: " + scaleH.getMinimum());