Diff of /ooDialog/trunk/ooDialog/oodPropertySheetDialog.cpp [r9375] .. [r9376]  Maximize  Restore

Switch to side-by-side view

--- a/ooDialog/trunk/ooDialog/oodPropertySheetDialog.cpp
+++ b/ooDialog/trunk/ooDialog/oodPropertySheetDialog.cpp
@@ -291,13 +291,13 @@
  *
  * @return INT_PRT
  */
-INT_PTR getSetActiveValue(RexxThreadContext *c, pCPropertySheetDialog pcpsd, RexxObjectPtr result, CSTRING name)
-{
-    INT_PTR ret = -2;
+intptr_t getSetActiveValue(RexxThreadContext *c, pCPropertySheetDialog pcpsd, RexxObjectPtr result, CSTRING name)
+{
+    intptr_t ret = -2;
 
     if ( c->IsPointer(result) )
     {
-        return (INT_PTR)c->PointerValue((RexxPointerObject)result);
+        return (intptr_t)c->PointerValue((RexxPointerObject)result);
     }
 
     int max = (int)pcpsd->pageCount;
@@ -458,10 +458,10 @@
  *
  * @return The handle to the image or the resource ID.
  */
-INT_PTR getImageOrID(RexxMethodContext *c, RexxObjectPtr self, RexxObjectPtr image, size_t argPos,
+intptr_t getImageOrID(RexxMethodContext *c, RexxObjectPtr self, RexxObjectPtr image, size_t argPos,
                      bool *isImage, uint8_t *type)
 {
-    INT_PTR result = 0;
+    intptr_t result = 0;
 
     if ( c->IsOfType(image, "IMAGE") )
     {
@@ -470,7 +470,7 @@
         {
             *isImage = true;
             *type = (uint8_t)oodImage->type;
-            result = (INT_PTR)oodImage->hImage;
+            result = (intptr_t)oodImage->hImage;
         }
     }
     else
@@ -1031,7 +1031,7 @@
 void doSetActiveCommon(RexxThreadContext *c, pCPropertySheetPage pcpsp, HWND hPage, CSTRING name)
 {
     pCPropertySheetDialog pcpsd = (pCPropertySheetDialog)pcpsp->cppPropSheet;
-    INT_PTR reply = 0;
+    intptr_t reply = 0;
 
     RexxObjectPtr result = c->SendMessage1(pcpsp->rexxSelf, name, pcpsd->rexxSelf);
 
@@ -2426,7 +2426,7 @@
     bool    isImage;
     uint8_t type;
 
-    INT_PTR result = getImageOrID(context, pcpsd->rexxSelf, icon, 1, &isImage, &type);
+    intptr_t result = getImageOrID(context, pcpsd->rexxSelf, icon, 1, &isImage, &type);
     if ( result != 0 )
     {
         if ( isImage )
@@ -2489,7 +2489,7 @@
     bool    isImage;
     uint8_t type;
 
-    INT_PTR result = getImageOrID(context, pcpsd->rexxSelf, header, 1, &isImage, &type);
+    intptr_t result = getImageOrID(context, pcpsd->rexxSelf, header, 1, &isImage, &type);
     if ( result != 0 )
     {
         if ( isImage )
@@ -2623,7 +2623,7 @@
     bool    isImage;
     uint8_t type;
 
-    INT_PTR result = getImageOrID(context, pcpsd->rexxSelf, watermark, 1, &isImage, &type);
+    intptr_t result = getImageOrID(context, pcpsd->rexxSelf, watermark, 1, &isImage, &type);
     if ( result != 0 )
     {
         if ( isImage )
@@ -3258,7 +3258,7 @@
 {
     pCPropertySheetDialog pcpsd = (pCPropertySheetDialog)pCSelf;
 
-    INT_PTR result = -2;
+    intptr_t result = -2;
 
     int max = (int)pcpsd->pageCount;
 
@@ -4307,7 +4307,7 @@
 
     if ( ! c->CheckCondition() && pcdd->active != NULL )
     {
-        ppdi->pageID = (INT_PTR)pcdd->base;
+        ppdi->pageID = (intptr_t)pcdd->base;
 
         // Set the number of dialog items field in the dialog template.
         ((DLGTEMPLATEEX *)pcdd->base)->cDlgItems = (WORD)pcdd->count;
@@ -4374,7 +4374,7 @@
 
     if ( ! c->CheckCondition() && pcdd->active != NULL )
     {
-        ppdi->pageID = (INT_PTR)pcdd->base;
+        ppdi->pageID = (intptr_t)pcdd->base;
 
         // Set the number of dialog items field in the dialog template.
         ((DLGTEMPLATEEX *)pcdd->base)->cDlgItems = (WORD)pcdd->count;
@@ -4398,7 +4398,7 @@
     {
         goto err_out;
     }
-    ppdi->pageID = (INT_PTR)ppdi->resID;
+    ppdi->pageID = (intptr_t)ppdi->resID;
 
     return TheTrueObj;
 
@@ -4593,7 +4593,7 @@
     bool    isImage;
     uint8_t type;
 
-    INT_PTR result = getImageOrID(context, pcpsp->rexxSelf, icon, 1, &isImage, &type);
+    intptr_t result = getImageOrID(context, pcpsp->rexxSelf, icon, 1, &isImage, &type);
     if ( result != 0 )
     {
         if ( isImage )

Get latest updates about Open Source Projects, Conferences and News.

Sign up for the SourceForge newsletter:





No, thanks