Changeset 156

Timestamp:

Jun 18, 2009, 8:25:34 PM (16 years ago)

Author:

lpino

Message:

• Temporary fix to the ColorDialog class. For some reason DosQueryModuleHandle call doesn't work so I replaced it with DosLoadModule

Location:

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

Files:

• editcol.c (modified) (2 diffs)
• editcol.h (modified) (1 diff)
• make_os2.icc (modified) (1 diff)

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

@@ -32 +32 @@
    PAPPDATA pad;
    ULONG i;
+   int rc;
 
    // allocate storage for application data
@@ -59 +60 @@
       return CLR_ERROR;
    // get the module handle to load the dialog from the DLL
-   if (DosQueryModuleHandle(SZ_MODULE, &pad->hDlgMod))
+   if (rc = DosLoadModule(NULL, 0, SZ_MODULE, &pad->hDlgMod))
       return CLR_ERROR;
    // copy the start color

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

@@ -42 +42 @@
 
 #define MAXTITLESIZE           128     // max length of dialog title
-#define SZ_MODULE     "EDITCOL.DLL"    // DLL name
+#define SZ_MODULE     "SWTP2049.DLL"    // DLL name
 
 

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

@@ -24 +24 @@
         target $SWT_LIB
         {
-                source "E:\\tmp\\inst\\dllsrc\\editcol.c"
-                source "E:\\tmp\\inst\\dllsrc\\editcol.h"
-                source "E:\\tmp\\inst\\dllsrc\\editcol.rc"
-                source "swt.c", "structs.c", "callback.c"
+ //               source "c:\\apps\\dev\\swt2\\trunk\\src\\plugins\\org.eclipse.swt\\Eclipse SWT PI\\pm\\library\\editcol.c"
+ //               source "c:\\apps\\dev\\swt2\\trunk\\src\\plugins\\org.eclipse.swt\\Eclipse SWT PI\\pm\\library\\editcol.h"
+ //               source "c:\\apps\\dev\\swt2\\trunk\\src\\plugins\\org.eclipse.swt\\Eclipse SWT PI\\pm\\library\\editcol.rc"
+                source "editcol.c", "editcol.h", "editcol.rc", "swt.c", "structs.c", "callback.c"
         }
     }