Changeset 246 for trunk/src


Ignore:
Timestamp:
Jan 14, 2010, 3:40:58 PM (16 years ago)
Author:
lpino
Message:
  • More changes needed to begin the Tree implementation
Location:
trunk/src/plugins/org.eclipse.swt/Eclipse SWT PI/pm
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r244 r246  
    179179TREEITEMDESC_FID_CACHE TREEITEMDESCFc;
    180180RECORDINSERT_FID_CACHE RECORDINSERTFc;
     181RECORDCORE_FID_CACHE RECORDCOREFc;
    181182SIZEL_FID_CACHE SIZELFc;
    182183CNRINFO_FID_CACHE CNRINFOFc;
    … …  
    19961997    (*env)->SetIntField(env, lpObject, lpCache->pSortRecord, (LONG)lpStruct->pSortRecord);
    19971998    (*env)->SetIntField(env, lpObject, lpCache->pFieldInfoLast, (LONG)lpStruct->pFieldInfoLast);
    1998     (*env)->SetIntField(env, lpObject, lpCache->pFieldInfoObject, lpStruct->pFieldInfoObject);
     1999    (*env)->SetIntField(env, lpObject, lpCache->pFieldInfoObject, (LONG)lpStruct->pFieldInfoObject);
    19992000    {
    20002001        jobject psz = (*env)->GetObjectField(env, lpObject, lpCache->pszCnrTitle);

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

    r241 r246  
    255255
    256256    if (owner && powner) setOWNERITEMFields(env, owner, (POWNERITEM)powner, &PGLOB(OWNERITEMFc));
     257}
     258
     259JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_pm_OS_objcpy__ILorg_eclipse_swt_internal_pm_RECORDCORE_2
     260    (JNIEnv *env, jclass that, jint powner, jobject owner)
     261{
     262    DECL_GLOB(pGlob)
     263
     264    DEBUG_CALL("objcpy\n")
     265    DEBUG_CHECK_NULL(env, (powner && owner))
     266
     267    if (powner && owner) getRECORDCOREFields(env, owner, (PRECORDCORE)powner, &PGLOB(RECORDCOREFc));
     268}
     269JNIEXPORT void JNICALL Java_org_eclipse_swt_internal_pm_OS_objcpy__Lorg_eclipse_swt_internal_pm_RECORDCORE_2I
     270    (JNIEnv *env, jclass that, jobject owner, jint powner)
     271{
     272    DECL_GLOB(pGlob)
     273
     274    DEBUG_CALL("objcpy\n")
     275    DEBUG_CHECK_NULL(env, (owner && powner))
     276
     277    if (owner && powner) setRECORDCOREFields(env, owner, (PRECORDCORE)powner, &PGLOB(RECORDCOREFc));
    257278}
    258279
    … …  
    628649    if (mpParam1)
    629650        setMENUITEMFields(env, mpParam1, c_pmpParam1, &PGLOB(MENUITEMFc));
     651    return rc;
     652}
     653
     654JNIEXPORT jint JNICALL Java_org_eclipse_swt_internal_pm_OS_WinSendMsg__IILorg_eclipse_swt_internal_pm_RECORDCORE_2Lorg_eclipse_swt_internal_pm_RECORDINSERT_2
     655         (JNIEnv *env, jclass that, jint hwnd, jint ulMsgid, jobject mpParam1, jobject mpParam2)
     656{
     657    RECORDCORE c_mpParam1, *c_pmpParam1 = NULL;
     658    RECORDINSERT c_mpParam2, *c_pmpParam2 = NULL;
     659    jint rc;
     660    if (mpParam2)
     661        c_pmpParam2 = getRECORDINSERTFields(env, mpParam2, &c_mpParam2, &PGLOB(RECORDINSERTFc));
     662    if (mpParam1)
     663        c_pmpParam1 = getRECORDCOREFields(env, mpParam1, &c_mpParam1, &PGLOB(RECORDCOREFc));
     664    rc = (jint)WinSendMsg((HWND)hwnd, ulMsgid, c_pmpParam1, c_pmpParam2);
     665    if (mpParam2)
     666        setRECORDINSERTFields(env, mpParam2, c_pmpParam2, &PGLOB(RECORDINSERTFc));
     667    if (mpParam1)
     668        setRECORDCOREFields(env, mpParam1, c_pmpParam1, &PGLOB(RECORDCOREFc));
    630669    return rc;
    631670}

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

    r245 r246  
    1010public class MINIRECORDCORE
    1111{
    12   public int cb;                                                /*  Structure size. */
     12  public int cb = 28;                                           /*  Structure size. */
    1313  public int flRecordAttr;                              /*  Attributes of container records. */
    1414  public POINTL  ptlIcon = new POINTL();       /*  Record position. */

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

    r236 r246  
    23272327   public static final int CID_MLE                 = 0x7FFA;   /* MLE window for direct edit*/
    23282328
     2329   /**********************************************************************/
     2330   /* Container messages                                                 */
     2331   /**********************************************************************/
     2332   public static final int CM_ALLOCDETAILFIELDINFO       = 0x0330;
     2333   public static final int CM_ALLOCRECORD                = 0x0331;
     2334   public static final int CM_ARRANGE                    = 0x0332;
     2335   public static final int CM_ERASERECORD                = 0x0333;
     2336   public static final int CM_FILTER                     = 0x0334;
     2337   public static final int CM_FREEDETAILFIELDINFO        = 0x0335;
     2338   public static final int CM_FREERECORD                 = 0x0336;
     2339   public static final int CM_HORZSCROLLSPLITWINDOW      = 0x0337;
     2340   public static final int CM_INSERTDETAILFIELDINFO      = 0x0338;
     2341   public static final int CM_INSERTRECORD               = 0x0339;
     2342   public static final int CM_INVALIDATEDETAILFIELDINFO  = 0x033a;
     2343   public static final int CM_INVALIDATERECORD           = 0x033b;
     2344   public static final int CM_PAINTBACKGROUND            = 0x033c;
     2345   public static final int CM_QUERYCNRINFO               = 0x033d;
     2346   public static final int CM_QUERYDETAILFIELDINFO       = 0x033e;
     2347   public static final int CM_QUERYDRAGIMAGE             = 0x033f;
     2348   public static final int CM_QUERYRECORD                = 0x0340;
     2349   public static final int CM_QUERYRECORDEMPHASIS        = 0x0341;
     2350   public static final int CM_QUERYRECORDFROMRECT        = 0x0342;
     2351   public static final int CM_QUERYRECORDRECT            = 0x0343;
     2352   public static final int CM_QUERYVIEWPORTRECT          = 0x0344;
     2353   public static final int CM_REMOVEDETAILFIELDINFO      = 0x0345;
     2354   public static final int CM_REMOVERECORD               = 0x0346;
     2355   public static final int CM_SCROLLWINDOW               = 0x0347;
     2356   public static final int CM_SEARCHSTRING               = 0x0348;
     2357   public static final int CM_SETCNRINFO                 = 0x0349;
     2358   public static final int CM_SETRECORDEMPHASIS          = 0x034a;
     2359   public static final int CM_SORTRECORD                 = 0x034b;
     2360   public static final int CM_OPENEDIT                   = 0x034c;
     2361   public static final int CM_CLOSEEDIT                  = 0x034d;
     2362   public static final int CM_COLLAPSETREE               = 0x034e;
     2363   public static final int CM_EXPANDTREE                 = 0x034f;
     2364   public static final int CM_QUERYRECORDINFO            = 0x0350;
     2365   public static final int CM_INSERTRECORDARRAY          = 0x0351;
     2366   public static final int CM_MOVETREE                   = 0x0352;
     2367   public static final int CM_SETTEXTVISIBILITY          = 0x0353;
     2368   public static final int CM_SETGRIDINFO                = 0x0354;
     2369   public static final int CM_QUERYGRIDINFO              = 0x0355;
     2370   public static final int CM_SNAPTOGRID                 = 0x0356;
     2371   
     2372   /**********************************************************************/
     2373   /* Container notifications                                            */
     2374   /**********************************************************************/
     2375   public static final int CN_DRAGAFTER                  = 101;
     2376   public static final int CN_DRAGLEAVE                  = 102;
     2377   public static final int CN_DRAGOVER                   = 103;
     2378   public static final int CN_DROP                          = 104;
     2379   public static final int CN_DROPHELP                   = 105;
     2380   public static final int CN_ENTER                         = 106;
     2381   public static final int CN_INITDRAG                   = 107;
     2382   public static final int CN_EMPHASIS                   = 108;
     2383   public static final int CN_KILLFOCUS                  = 109;
     2384   public static final int CN_SCROLL                        = 110;
     2385   public static final int CN_QUERYDELTA                 = 111;
     2386   public static final int CN_SETFOCUS                   = 112;
     2387   public static final int CN_REALLOCPSZ                 = 113;
     2388   public static final int CN_BEGINEDIT                  = 114;
     2389   public static final int CN_ENDEDIT                    = 115;
     2390   public static final int CN_COLLAPSETREE               = 116;
     2391   public static final int CN_EXPANDTREE                 = 117;
     2392   public static final int CN_HELP                       = 118;
     2393   public static final int CN_CONTEXTMENU                = 119;
     2394   public static final int CN_VERIFYEDIT                 = 134;
     2395   public static final int CN_PICKUP                     = 135;
     2396   public static final int CN_DROPNOTIFY                 = 136;
     2397   public static final int CN_GRIDRESIZED                = 137;
     2398
     2399   /**********************************************************************/
     2400   /* Message parameter flags                                            */
     2401   /**********************************************************************/
     2402   public static final int CMA_TOP              = 0x0001;       /* Place at top of zorder   */
     2403
     2404   public static final int CMA_FIRST            = 0x0010;       /* Add record as first      */
     2405   public static final int CMA_LAST             = 0x0020;
     2406   public static final int CMA_END              = 0x0040;       /* Add record to end of list*/
     2407   public static final int CMA_PREV             = 0x0080;
     2408   public static final int CMA_NEXT             = 0x0100;
     2409
    23292410/* PM macros */
    23302411
    … …  
    23712452public static final native void objcpy (int to, OWNERITEM from);   
    23722453public static final native void objcpy (OWNERITEM to, int from);
     2454
     2455public static final native void objcpy (int to, RECORDCORE from);   
     2456public static final native void objcpy (RECORDCORE to, int from);
    23732457
    23742458/* PM functions */
    … …  
    24152499public static final native int WinSendMsg (int hwnd, int ulMsgid, LBOXINFO mpParam1, PSZ[] mpParam2);
    24162500public static final native int WinSendMsg (int hwnd, int ulMsgid, MENUITEM mpParam1, PSZ mpParam2);
     2501public static final native int WinSendMsg (int hwnd, int ulMsgid, RECORDCORE mpParam1, RECORDINSERT mpParam2);
    24172502public static final native int WinSendMsg (int hwnd, int ulMsgid, int[] mpParam1, int mpParam2);
    24182503public static final native boolean WinSendMsg (int hwnd, int ulMsgid, int mpParam1, MENUITEM mpParam2);

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

    r245 r246  
    1010public class RECORDCORE
    1111{
    12   public int cb;                                                                                /*  Structure size. */
     12  public int cb = 56;                                                                           /*  Structure size. */
    1313  public int flRecordAttr;                                                              /*  Container record attributes. */
    1414  public POINTL ptlIcon = new POINTL();                                         /*  Position of a container record in the icon view. */

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

    r245 r246  
    1010public class RECORDINSERT
    1111{
    12   public int cb;                                        /*  Structure size. */
     12  public static final int cb = 24;               /*  Structure size. */
    1313  public int pRecordOrder;                      /*  Record order. */
    1414  public int pRecordParent;                     /*  Pointer to record parent. */
Note: See TracChangeset for help on using the changeset viewer.