Changeset 133 for trunk/mediafolder/c/helper/launchpad.cpp

Timestamp:

Nov 29, 2023, 5:59:34 PM (21 months ago)

Author:

gyoung

Message:

Merge Lar's 2.9 branch into the trunk

File:

• trunk/mediafolder/c/helper/launchpad.cpp (modified) (44 diffs)

trunk/mediafolder/c/helper/launchpad.cpp

@@ -18 +18 @@
  */
 
-#define INCL_WIN
-#define INCL_GPILCIDS
-#define INCL_GPIPRIMITIVES
-#define INCL_GPIBITMAPS
-
+#define INC_WIN
+#define INCL_PM
+#define INCL_GPI
 
 #include "mediafolder.hh"
 #include "launchpad.hh"
+#include "cwcdtrack.hh"
 
 #include <os2.h>
@@ -32 +31 @@
 
 #include "sys_funcs.h"
+SOMClass* somhlpGetSomClass(char* chrClassName);
 
 extern HWND hwndShadow;// The handle of the help window
@@ -57 +57 @@
 MRESULT EXPENTRY shadowProc(HWND hwnd, ULONG msg,MPARAM mp1,MPARAM mp2 );
 
+
+BOOL APIENTRY myDrgDeleteDraginfoStrHandles(PDRAGINFO pDragInfo)
+{
+   /* a replacement for DrgDeleteDraginfoStrHandles */
+   /* because that routine will fail if any one hstr is invalid */
+
+   ULONG i,ulItems;
+   PDRAGITEM pDragItem;
+
+   ulItems = DrgQueryDragitemCount(pDragInfo);
+   for (i=0;i<ulItems;i++)
+   {
+      pDragItem = DrgQueryDragitemPtr(pDragInfo,i);
+      DrgDeleteStrHandle(pDragItem->hstrType);
+      DrgDeleteStrHandle(pDragItem->hstrRMF);
+      DrgDeleteStrHandle(pDragItem->hstrContainerName);
+      DrgDeleteStrHandle(pDragItem->hstrSourceName);
+      DrgDeleteStrHandle(pDragItem->hstrTargetName);
+   }
+   return TRUE;
+}
+
+
 /******************************************************************************/
 /*  New button procedure which handles the context menu stuff for the objects */
@@ -75 +98 @@
   switch (msg)
     {
-#if 0
-    case WM_BEGINDRAG:
-      if(SHORT1FROMMP(mp2)||1) {
-        //  DosBeep(5000,130);
-        lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lpo) {
-          wpObject=lpo->wpObject;
-          if(somIsObj(wpObject)) {
-#if 0
-            DragItem.hwndItem=hwnd;
-            DragItem.ulItemID=(ULONG)wpObject;
-            DragItem.hstrType=DrgAddStrHandle("DRT_UNKNOWN");
-            DragItem.hstrRMF=DrgAddStrHandle("DRM_OBJECT");
-            DragItem.hstrContainerName=DrgAddStrHandle("E:\\CD-Brenner\\ADC_050\\!AUDIOCD_TOOLBAR!");
-            DragItem.hstrSourceName=DrgAddStrHandle("E:\\CD-Brenner\\ADC_050\\");
-#endif
-            wpObject->wpFormatDragItem(&DragItem);
-            //            DragItem.fsSupportedOps=DO_LINKABLE;
-            DragInfo=DrgAllocDraginfo(1);
-           
-            DrgSetDragitem(DragInfo, &DragItem,(ULONG)sizeof(DragItem),0);
-            memset(&DragImage, 0, sizeof(DragImage));
-            DragImage.cb=sizeof(DragImage);
-            DragImage.fl=DRG_ICON;
-            DragImage.hImage=wpObject->wpQueryIcon();
-            
-
-            if(DrgDrag(hwnd, DragInfo, &DragImage, 1, VK_ENDDRAG, NULL)) {
-              lpo->lpParent->lpRefreshLaunchPad();
-            }
-
-            /* Free DragInfo here!!!!!!!!!!! */
-            //DrgDeleteDraginfoStrHandles(pDragInfo);
-            // ????? DrgFreeDraginfo(DragInfo);
-            return (MRESULT)TRUE;
-          }/* somIsObj() */
-        }/* lpo */
-      }
-      break;
-
-    case DM_ENDCONVERSATION:
-    case DM_DRAGFILECOMPLETE:
-    case DM_DROPNOTIFY:
-    case DM_FILERENDERED:
-    case DM_RENDERCOMPLETE:
-      DosBeep(500,500);
-break;
-      return (MRESULT)FALSE;
-    case WM_ENDDRAG:
-      DosBeep(500,500);
-      return (MRESULT)TRUE;
-      break;
-#endif
     case WM_PAINT:
       lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
@@ -166 +136 @@
       {
         BOOL bReturn=FALSE;
-        
+
         TRY_LOUD(LP_DRAGOVER) {
-        lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lpo) {
-          wpObject=lpo->wpObject;
-          if(somIsObj(wpObject)) {
-            char chrClassName[10];
-            LONG lLength;
-            
-            pDragInfo=(PDRAGINFO) mp1;
-            hwndMenu=pDragInfo->hwndSource;
-            lLength=sizeof(chrClassName);
-            WinQueryClassName(hwndMenu, lLength, chrClassName);
-            if(strcmp(chrClassName,"#37"))
-              hwndMenu=NULL;/* Source isn't a container */
-            if(!bDrawn) {
-              HPS hps;
-              RECTL rectl;
-              SWP swp;
-
-              /* Draw the rect */
-              hps=DrgGetPS(hwnd);
-              WinQueryWindowPos(hwnd,&swp);
-              rectl.xLeft=1;
-              rectl.yBottom=1;
-              rectl.xRight=swp.cx-1;
-              rectl.yTop=swp.cy-1;
-              //WinDrawBorder(hps,&rectl, 3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);  
-              DrgReleasePS(hps);
-              //bDrawn=TRUE;
-            }
-            bReturn=TRUE;
-          }
-        }
+           lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
+           if(lpo) {
+             wpObject=lpo->wpObject;
+             if(somIsObj(wpObject)) {
+               char chrClassName[10];
+               LONG lLength;
+
+               pDragInfo=(PDRAGINFO) mp1;
+               hwndMenu=pDragInfo->hwndSource;
+               lLength=sizeof(chrClassName);
+               WinQueryClassName(hwndMenu, lLength, chrClassName);
+               if(strcmp(chrClassName,"#37"))
+                 hwndMenu=NULL;/* Source isn't a container */
+               if(!bDrawn) {
+                 HPS hps;
+                 RECTL rectl;
+                 SWP swp;
+
+                 /* Draw the rect */
+                 hps=DrgGetPS(hwnd);
+                 WinQueryWindowPos(hwnd,&swp);
+                 rectl.xLeft=1;
+                 rectl.yBottom=1;
+                 rectl.xRight=swp.cx-1;
+                 rectl.yTop=swp.cy-1;
+                 //WinDrawBorder(hps,&rectl, 3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);
+                 DrgReleasePS(hps);
+                 //bDrawn=TRUE;
+               }
+               bReturn=TRUE;
+             }
+           }
         }
         CATCH(LP_DRAGOVER)
-          {
-          } END_CATCH;
-          if(bReturn)
-            return wpObject->wpDragOver(hwndMenu,(PDRAGINFO) mp1);
-          break;
+        {
+        } END_CATCH;
+        if(bReturn)
+         return wpObject->wpDragOver(hwndMenu,(PDRAGINFO) mp1);
+        break;
       }
     case DM_DRAGLEAVE:
@@ -213 +183 @@
         SWP swp;
         HPS hps;
-        
+
         /* Remove target emphasis here */
         hps=DrgGetPS(hwnd);
@@ -221 +191 @@
         rectl.xRight=swp.cx-1;
         rectl.yTop=swp.cy-1;
-        // WinDrawBorder(hps,&rectl,3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);  
+        // WinDrawBorder(hps,&rectl,3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);
         bDrawn=FALSE;
         DrgReleasePS(hps);
@@ -238 +208 @@
           if(lpo) {
             wpObject=lpo->wpObject;
-            if(somIsObj(wpObject)) { 
+            if(somIsObj(wpObject)) {
               pDragInfo=(PDRAGINFO) mp1;
               pDragItem=DrgQueryDragitemPtr(pDragInfo, 0);
@@ -264 +234 @@
         if(somIsObj(wpObject)) {
           if((SHORT)0x6d==SHORT1FROMMP(mp1)) {
-            /* Delete menu item */       
+            /* Delete menu item */
             if(wpObject->wpDelete(CONFIRM_DELETE|CONFIRM_DELETEFOLDER ) == OK_DELETE)
               lpo->lpParent->lpRemoveButton(lpo);
@@ -272 +242 @@
         }/* end of if(somIsObj(wpObject)) */
       }
-      }  
+      }
       CATCH(LP_COMMAND)
         {
@@ -288 +258 @@
 static MRESULT handleDragOver(HWND hwnd, MPARAM mp1, MPARAM mp2)
 {
-  MRESULT mResult;
   ULONG ulNumberOfObjects;
   PDRAGINFO pDragInfo;
@@ -294 +263 @@
   RECTL rectl;
   SWP swp;
-
-  mResult = MRFROM2SHORT( DOR_NODROPOP, DO_LINK);
-  
+  USHORT usIndicator=DOR_NEVERDROP,usOp=0;
+  WPObject *wpObject = NULL;
+
   /* Get access to the dragInfo */
   pDragInfo=(PDRAGINFO)mp1;
-  DrgAccessDraginfo(pDragInfo);
-  /* Get number of items */
-  ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);
-
-  if(ulNumberOfObjects>1) {
-    /* Free the draginfo */
-    DrgFreeDraginfo(pDragInfo);
-    return MRFROM2SHORT( DOR_NODROPOP, DO_LINK);
+  if (DrgAccessDraginfo(pDragInfo)) {
+      PDRAGITEM pDragItem = NULL;
+      SOMClass *cdTrackClass = NULL;
+
+        /* Get number of items */
+        ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);
+
+        if(ulNumberOfObjects>1) {
+         usIndicator = DOR_NODROP;
+         usOp = 0;
+         goto quit;
+        }
+
+      /* check if a WPS object was dropped, we do not accept anything else */
+      pDragItem = DrgQueryDragitemPtr(pDragInfo,0);
+      if (!DrgVerifyRMF(pDragItem,"DRM_OBJECT","DRF_OBJECT")) {
+         usIndicator = DOR_NEVERDROP;
+         usOp = 0;
+         goto quit;
+      } /* endif */
+
+      /*
+         refuse drop if WPS object pointer is not valid or if the object is
+         a descendant of MMCDTrack class (see Netlabs ticket #19)
+      */
+      wpObject = (WPObject *)OBJECT_FROM_PREC(pDragItem->ulItemID);
+      cdTrackClass = somhlpGetSomClass("MMCDTrack");
+      if (!somIsObj(wpObject) || wpObject->somIsA(cdTrackClass)) {
+         usIndicator = DOR_NEVERDROP;
+         usOp = 0;
+         goto quit;
+      } /* endif */
+
+        switch(pDragInfo->usOperation)
+       {
+       case DO_DEFAULT:
+       case DO_LINK:
+         if(!bDrawn) {
+           POINTL ptl;
+           launchPad * lp;
+
+           ptl.x=SHORT1FROMMP(mp2);
+           ptl.y=SHORT2FROMMP(mp2);
+           /* Pos in window coords */
+           WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
+
+           hps=DrgGetPS(hwnd);
+           WinQueryWindowPos(hwnd,&swp);
+
+           rectl.xLeft=swp.cx;//-swp.cy;
+
+           lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
+           if(lp) {
+             if(lp->lpQueryNumObjects()==0) {
+               rectl.xLeft=0;
+             }
+           }
+
+           rectl.yTop=swp.cy-1;
+           rectl.yBottom=1;
+           if(ptl.x<rectl.xLeft) {
+             int numB;
+
+             numB=(ptl.x-xButtonOffset)/(swp.cy+xButtonDelta);
+             rectl.xLeft=((ptl.x-numB*swp.cy) > swp.cy/2 ? numB+1: numB);
+             rectl.xLeft*=(swp.cy+xButtonDelta);
+             rectl.xLeft-=(xButtonDelta)-xButtonOffset+xButtonDelta;
+             rectl.xRight=rectl.xLeft+(xButtonDelta*2);
+           }
+           else {
+             rectl.xRight=swp.cx-1;
+           }
+           rclDrawn=rectl;
+           WinDrawBorder(hps,&rectl, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);
+           bDrawn=TRUE;
+
+           DrgReleasePS(hps);
+         }
+         usIndicator = DOR_DROP;
+         usOp = DO_LINK;
+         break;
+      default:
+         usIndicator = DOR_NODROPOP;
+         usOp = DO_LINK;
+         break;
+       }
+quit:
+     /* Free the draginfo */
+     DrgFreeDraginfo(pDragInfo);
   }
-
-  switch(pDragInfo->usOperation)
-    {
-    case DO_DEFAULT:
-    case DO_LINK:
-      if(!bDrawn) {
-        POINTL ptl;
-        launchPad * lp;
-        
-        ptl.x=SHORT1FROMMP(mp2);
-        ptl.y=SHORT2FROMMP(mp2);
-        /* Pos in window coords */
-        WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
-
-        hps=DrgGetPS(hwnd);
-        WinQueryWindowPos(hwnd,&swp);
-
-        rectl.xLeft=swp.cx;//-swp.cy;
-
-        lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lp) {
-          if(lp->lpQueryNumObjects()==0) {
-            rectl.xLeft=0;
-          }
-        }
-        
-        rectl.yTop=swp.cy-1;    
-        rectl.yBottom=1;
-        if(ptl.x<rectl.xLeft) {
-          int numB;
-
-          numB=(ptl.x-xButtonOffset)/(swp.cy+xButtonDelta);
-          rectl.xLeft=((ptl.x-numB*swp.cy) > swp.cy/2 ? numB+1: numB);
-          rectl.xLeft*=(swp.cy+xButtonDelta);
-          rectl.xLeft-=(xButtonDelta)-xButtonOffset+xButtonDelta;
-          rectl.xRight=rectl.xLeft+(xButtonDelta*2);
-        }
-        else {
-          rectl.xRight=swp.cx-1;
-        }
-        rclDrawn=rectl;
-        WinDrawBorder(hps,&rectl, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);  
-        bDrawn=TRUE; 
-        
-        DrgReleasePS(hps);
-      }
-      mResult = MRFROM2SHORT( DOR_DROP, DO_LINK);
-      break;
-    default:
-      break;
-    }
-
-  /* Free the draginfo */
-  DrgFreeDraginfo(pDragInfo);
-
-  return mResult;
+  return MRFROM2SHORT(usIndicator,usOp);
 }
 
@@ -375 +370 @@
   /* Remove target emphasis here */
   hps=DrgGetPS(hwnd);
-  WinDrawBorder(hps,&rclDrawn, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);  
+  WinDrawBorder(hps,&rclDrawn, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);
   DrgReleasePS(hps);
-  bDrawn=FALSE; 
+  bDrawn=FALSE;
   return (MRESULT) FALSE;
 }
 
 
-static MRESULT EXPENTRY launchPadWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+static MRESULT EXPENTRY launchPadWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   WPFolder* thisPtr;
   launchPad * lp;
   LPObject *lpo;
-  static USHORT id=0;//Initialisation new in V1.00a 
+  static USHORT id=0;//Initialisation new in V1.00a
 
   switch(msg)
     {
-#if 0
-    case DM_ENDCONVERSATION:
-    case DM_DRAGFILECOMPLETE:
-    case DM_DROPNOTIFY:
-    case DM_FILERENDERED:
-    case DM_RENDERCOMPLETE:
-      DosBeep(500,500);
-break;
-      return (MRESULT)FALSE;
-    case WM_ENDDRAG:
-      DosBeep(500,500);
-      break;
-      return (MRESULT)TRUE;
-#endif
     case WM_PAINT:
       {
@@ -426 +407 @@
     case DM_DROP:
       {
-        ULONG ulCount;
-        ULONG ulNumberOfObjects;
-        PDRAGITEM pDragItem;
-        SOMClass *folderClass;
-        WPObject * wpObject;
-        PDRAGINFO pDragInfo;
-       
-        TRY_LOUD(LP_FRAMEDROP) { 
+        TRY_LOUD(LP_FRAMEDROP) {
           /* A new object dropped on the launchpad */
-          pDragInfo=(PDRAGINFO)mp1;
+          PDRAGINFO pDragInfo=(PDRAGINFO)mp1;
           if(DrgAccessDraginfo(pDragInfo)) {
-            /* Get number of items */
-            ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);           
-            if(ulNumberOfObjects>1){
-              /* Free the draginfo */
-              DrgDeleteDraginfoStrHandles(pDragInfo);
-              DrgFreeDraginfo(pDragInfo);
-            }
-            else { 
-              ulCount=0;
-              
-              pDragItem=DrgQueryDragitemPtr( pDragInfo, ulCount);
-              wpObject=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, ulCount)->ulItemID);
               lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
               if(lp) {
-                if(somIsObj(wpObject)) {
-  
+                  PDRAGITEM pDragItem=DrgQueryDragitemPtr( pDragInfo, 0);
+                  WPObject *wpObject=(WPObject*)OBJECT_FROM_PREC(pDragItem->ulItemID);
                   POINTL ptl;
                   int numB;
                   SWP swp;
-                  
+
                   WinQueryWindowPos(hwnd,&swp);
                   ptl.x=pDragInfo->xDrop;
@@ -467 +429 @@
                   /* Do a link */
                   lp->lpAddButton(wpObject, numB);
-                  handleDragLeave(hwnd, mp1, mp2);
-                }
               }
-              DrgDeleteDraginfoStrHandles(pDragInfo);
+              myDrgDeleteDraginfoStrHandles(pDragInfo);
               DrgFreeDraginfo(pDragInfo);
-            }
           }
           handleDragLeave(hwnd, mp1, mp2);
@@ -479 +438 @@
           {
           } END_CATCH;
-          
-          break;
+          return MRFROMLONG(0);
       }
     case DM_DRAGLEAVE:
@@ -496 +454 @@
       return (MRESULT)FALSE;
       /***********************************************/
-      /* Stuff for fly over help                     */ 
+      /* Stuff for fly over help                     */
     case WM_MOUSEMOVE:
       launchPad * lp;
@@ -506 +464 @@
         }
       }
-      
-#if 0
-      tempID=WinQueryWindowUShort(hwnd,QWS_ID);/*  get the id of the window under the pointer  */                       
-      if(id!=tempID) {  // New Button?  
-        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,tempID,(ULONG)iTBFlyOverDelay); // New timer for delay
-        id=tempID;  // Save ID 
-      }
-      else {
-        if(!hwndBubbleWindow)
-          WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,tempID,(ULONG)iTBFlyOverDelay); // New timer for delay   
-      }
-#endif
+
       if(!hwndBubbleWindow)
         WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 2,(ULONG)iTBFlyOverDelay); // New timer for delay        
@@ -541 +488 @@
       HPS  hps;
       RECTL   rcl;
-  
+
       /*  we have to build a new information window  */
-      if(hwndBubbleWindow){// if(){...} new in V1.00a 
+      if(hwndBubbleWindow){// if(){...} new in V1.00a
         WinDestroyWindow(hwndBubbleWindow);/*  close the bubblewindow  */
         hwndBubbleWindow=NULL;
@@ -551 +498 @@
       WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
       WinQueryWindowRect(hwnd,&rclWork);                                
-      if(!hwndBubbleWindow 
+      if(!hwndBubbleWindow
          && WinPtInRect(WinQueryAnchorBlock(hwnd),&rclWork,&ptl)
          && bTBFlyOverEnabled) {
-        
+
         static HWND hwndBubbleClient;
         ULONG style=FCF_BORDER|FCF_NOBYTEALIGN;
         char winText[255] = {0};
-        
+
         /* Get window text for size calculating */
             lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
@@ -567 +514 @@
 
         ulWinTextLen=(LONG)strlen(winText); // Query text length
-        
+
         /* Delete 'Returns' in object title */
         char *pBuchst;
@@ -579 +526 @@
           pRest=pBuchst;
         }
-        
+
         /* Create help window */
         hwndBubbleWindow=WinCreateStdWindow(HWND_DESKTOP,
@@ -612 +559 @@
         GpiQueryTextBox(hps,ulWinTextLen,winText,TXTBOX_COUNT,aptlPoints);
         WinEndPaint(hps);
-        
+
         /* Set colors */
         WinSetPresParam(hwndBubbleClient,
@@ -620 +567 @@
                         PP_FOREGROUNDCOLOR,sizeof(rgbTBFlyForeground) ,
                         &rgbTBFlyForeground );
-        
+
         /* Calculate bubble positon and show bubble */
         WinQueryPointerPos(HWND_DESKTOP,&ptl);//Query pointer position in the desktop window
         WinQueryWindowRect(HWND_DESKTOP,&rcl);//Query desktop size
-        aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+7+xVal+ptl.x 
-          > rcl.xRight 
-          ? deltaX=-aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x-xVal-xVal-7 
+        aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+7+xVal+ptl.x
+          > rcl.xRight
+          ? deltaX=-aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x-xVal-xVal-7
               : deltaX=0 ;
-        
-        aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2+yVal+ptl.y 
-          > rcl.yTop 
+
+        aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2+yVal+ptl.y
+          > rcl.yTop
           ? deltaY=-aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y-2*yVal-7
               : deltaY=0 ;              
         WinSetWindowPos(hwndBubbleWindow,
                         HWND_TOP,
-                        ptl.x+xVal+deltaX,ptl.y+yVal+deltaY,  
+                        ptl.x+xVal+deltaX,ptl.y+yVal+deltaY,
                         aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+8,
                         aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2,
@@ -643 +590 @@
                         hwndBubbleWindow,
                         ptl.x+xVal+deltaX+5
-                        ,ptl.y+yVal+deltaY-5,  
+                        ,ptl.y+yVal+deltaY-5,
                         aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+8,
                         aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2,
                         SWP_ZORDER|SWP_SIZE|SWP_MOVE|SWP_SHOW);
-        
+
         /* Set bubble text */
         WinSetWindowText(hwndBubbleClient,winText);
-        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,1,35); 
+        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,1,35);
       } // end if(!hwndBubbleWindow)
       break;
@@ -666 +613 @@
             WinQueryWindowRect(hwnd, &rclWork);
             if(!WinPtInRect(WinQueryAnchorBlock(hwnd),&rclWork,&ptl))
-              { // Window has changed                            
+              { // Window has changed                           
                 WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, 1);  // stop the running timer
-                if(hwndBubbleWindow) 
+                if(hwndBubbleWindow)
                   WinDestroyWindow(hwndBubbleWindow);/*  close the bubblewindow  */
                 hwndBubbleWindow=0;
@@ -694 +641 @@
       break;
     default:
-      break;    
+      break;
     }
   return pfnwpOldLPProc(hwnd, msg, mp1, mp2);
@@ -701 +648 @@
 void LPList::lplRefreshAllPads()
 {
-  
+
 }
 
@@ -711 +658 @@
 LPObject::~LPObject(void)
 {
-#if 0
-  if(hPtr) {
-    if(!WinDestroyPointer(hPtr))
-      DosBeep(100,200);
-  }
-#endif
 }
 
@@ -766 +707 @@
   if(hwndLaunchPad)
     WinDestroyWindow(hwndLaunchPad);
-    
+
   /* Remove this pad from the list of pads */
   lplTemp=lplAllLPads;
@@ -844 +785 @@
       }
     }
-  
+
   lpBuildObjectList(chrConfigID);
 
@@ -859 +800 @@
   /* Refresh all launchpads */
   LPList *lplTemp;
-  
+
   //lplTemp=lplAllLPads;
   lplTemp=*lpList;
@@ -902 +843 @@
       }
   }
-  
-  lpSaveObjectList();   
+
+  lpSaveObjectList();
   lpRefreshLaunchPad();
 
@@ -967 +908 @@
         if((lpoTempNew=new LPObject(wpTempObject->wpQueryIcon()))!=NULL) {
           ULONG ulRC;
-          
+
           lpoTempNew->wpObject=wpTempObject;
           lpoTempNew->wpObject->wpLockObject();
@@ -1017 +958 @@
       if(!SysCheckFileExists(chrConfigTarget))
         return FALSE; /* No install dir defined */
-      
+
       sprintf(chrPath,"OBJECTID=%s",chrConfigID);
       if((hObject2=WinCreateObject("WPFolder", chrConfigID, chrPath,chrConfigTarget,CO_FAILIFEXISTS))==NULLHANDLE)
         return FALSE; /* Can't create new toolbar folder */
     }
-  
+
   /* Get toolbar folder */
   if(somIsObj(wpParentFolder)) {
@@ -1038 +979 @@
   wpFolder->wpQueryRealName(chrPath, &ulBufferSize, TRUE);
   strcat(chrPath,"\\objects.ini");/* Ini-File containing the hobjects */
-  
-  //  WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrPath, "~launchPad", 123, MB_OK| MB_MOVEABLE);  
+
+  //  WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrPath, "~launchPad", 123, MB_OK| MB_MOVEABLE);
   do{
     /* Open the ini-file */
     if((hIni=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),chrPath))==NULLHANDLE)
-      break; 
+      break;
 
     if((memPtr=(char*)malloc(ulNumObjects*sizeof(HOBJECT)))==NULL)
       break;
-    
+
 
     hObject=(HOBJECT*)memPtr;
@@ -1064 +1005 @@
 
     free(hObject);
-    
+
     PrfCloseProfile(hIni);
     return TRUE;
@@ -1083 +1024 @@
   WPObject* wpObject;
 
-  char chrText[200];  
+  char chrText[200];
   ULONG ul;
 
@@ -1113 +1054 @@
   wpFolder->wpQueryRealName(chrPath, &ulBufferSize, TRUE);
   strcat(chrPath,"\\objects.ini");/* Ini-File containing the hobjects */
-  
+
   do{
     /* Open the ini-file */
     if((hIni=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),chrPath))==NULLHANDLE)
-      break; 
- 
+      break;
+
     if(!PrfQueryProfileSize(hIni,"objects","handles", &ulBufferSize))
       break;
@@ -1127 +1068 @@
     if((memPtr=(char*)malloc(ulBufferSize))==NULL)
       break;
-    
-    ulNumObjects=ulBufferSize/sizeof(HOBJECT);    
+
+    ulNumObjects=ulBufferSize/sizeof(HOBJECT);
 
     if(!PrfQueryProfileData(hIni,"objects","handles", memPtr, &ulBufferSize)){
@@ -1149 +1090 @@
             strncpy(lpoTemp->chrName, wpTempObject->wpQueryTitle(),sizeof(lpoTemp->chrName));
             lpoTemp->lpParent=this;
-            
+
             lpoTemp->lpoNext=lpoObjectList;
             lpoObjectList=lpoTemp;
@@ -1158 +1099 @@
         }
       }/* for */
-    
+
     free(hObjectArray);
-    
+
     PrfCloseProfile(hIni);
     return TRUE;
@@ -1249 +1190 @@
   for(a=ulNumObjects;a>0 && lpoTemp; a--)
     {
-      /* Create Buttons */ 
+      /* Create Buttons */
       if((hwndTemp=WinCreateWindow(hwndLaunchPad, WC_BUTTON, lpoTemp->chrName, WS_VISIBLE, xButtonOffset+(a-1)*(swp.cy+xButtonDelta), 1, swp.cy-2, swp.cy-2,
                                    hwndLaunchPad, HWND_TOP, a*100,
@@ -1276 +1217 @@
       lpoTemp=lpoTemp->lpoNext;
     }
-  return TRUE;  
-}
-
-
-
+  return TRUE;
+}
+