wmaker: Fix compiler warnings about pointer <--> integer conversion

There may be issues with running applications in 64-bit mode when
they were written with tacit assumptions about 32-bit platforms.
For example,

    * Assuming that a pointer can be cast back and forth to an integer

The reason is that the size of the integer and pointer may be different.
See the description of "[PATCH] Warn when casting a pointer (constant)
to an integer of different size." in the gcc mailing list

http://gcc.gnu.org/ml/gcc-patches/2005-12/msg01881.html

where it was also suggested the use of casts to uintptr_t. This is
what this patch does.

As a result the following warnings are fixed, leaving us with an
almost warning-free compilation in 64-bit platforms:

defaults.c:1446: warning: cast to pointer from integer of different size
defaults.c:1457: warning: cast to pointer from integer of different size
defaults.c:1471: warning: cast to pointer from integer of different size
defaults.c:1486: warning: cast to pointer from integer of different size
icon.c:67: warning: cast from pointer to integer of different size
menu.c:112: warning: cast from pointer to integer of different size
switchmenu.c:452: warning: cast from pointer to integer of different size
window.c:140: warning: cast from pointer to integer of different size
window.c:2217: warning: cast to pointer from integer of different size
workspace.c:135: warning: cast to pointer from integer of different size
workspace.c:214: warning: cast to pointer from integer of different size
workspace.c:634: warning: cast to pointer from integer of different size
workspace.c:1330: warning: cast to pointer from integer of different size
workspace.c:1514: warning: cast to pointer from integer of different size
wfilepanel.c:135: warning: cast from pointer to integer of different size
wfilepanel.c:171: warning: cast from pointer to integer of different size
wfontpanel.c:499: warning: cast to pointer from integer of different size
wfontpanel.c:500: warning: cast to pointer from integer of different size
wfontpanel.c:505: warning: cast to pointer from integer of different size
wfontpanel.c:506: warning: cast to pointer from integer of different size
wfontpanel.c:776: warning: cast from pointer to integer of different size
wfontpanel.c:777: warning: cast from pointer to integer of different size
wfontpanel.c:877: warning: cast from pointer to integer of different size
wfontpanel.c:878: warning: cast from pointer to integer of different size
wpanel.c:363: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:42: warning: cast from pointer to integer of different size
fontl.c:90: warning: cast to pointer from integer of different size
puzzle.c:138: warning: cast from pointer to integer of different size
puzzle.c:225: warning: cast to pointer from integer of different size
wtableview.c:1031: warning: cast to pointer from integer of different size
wtableview.c:1067: warning: cast to pointer from integer of different size
wtableview.c:1069: warning: cast to pointer from integer of different size
wtableview.c:1074: warning: cast to pointer from integer of different size
wtabledelegates.c:234: warning: cast from pointer to integer of different size
wtabledelegates.c:250: warning: cast from pointer to integer of different size
wtabledelegates.c:265: warning: cast from pointer to integer of different size
wtabledelegates.c:287: warning: cast to pointer from integer of different size
wtabledelegates.c:351: warning: cast from pointer to integer of different size
wtabledelegates.c:372: warning: cast from pointer to integer of different size
wtabledelegates.c:393: warning: cast from pointer to integer of different size
wtabledelegates.c:410: warning: cast to pointer from integer of different size
test.c:44: warning: cast from pointer to integer of different size
test.c:47: warning: cast to pointer from integer of different size
test.c:55: warning: cast from pointer to integer of different size
test.c:58: warning: cast from pointer to integer of different size

WINGs/Extras/test.c

@@ -2,6 +2,7 @@
 
 #include <WINGs/WINGs.h>
 #include <stdio.h>
+#include <stdint.h>
 #include "wtableview.h"
 #include "wtabledelegates.h"
 
@@ -41,10 +42,10 @@ valueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row)
             col2[i] = 0;
         }
     }
-    if ((int)WMGetTableColumnId(column) == 1)
+    if ((int)(uintptr_t)WMGetTableColumnId(column) == 1)
         return col1[row];
     else
-        return (void*)col2[row];
+        return (void*)(uintptr_t)col2[row];
 }
 
 
@@ -52,10 +53,10 @@ void
 setValueForCell(WMTableViewDelegate *self, WMTableColumn *column, int row,
                 void *data)
 {
-    if ((int)WMGetTableColumnId(column) == 1)
+    if ((int)(uintptr_t)WMGetTableColumnId(column) == 1)
         col1[row] = data;
     else
-        col2[row] = (int)data;
+        col2[row] = (int)(uintptr_t)data;
 }
 
 

WINGs/Extras/wtabledelegates.c

@@ -1,5 +1,5 @@
 
-
+#include <stdint.h>
 #include <WINGs/WINGsP.h>
 
 #include "wtableview.h"
@@ -231,7 +231,7 @@ ESCellPainter(WMTableColumnDelegate *self, WMTableColumn *column,
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
 
     stringDraw(WMWidgetScreen(table), d,
                strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -247,7 +247,7 @@ selectedESCellPainter(WMTableColumnDelegate *self, WMTableColumn *column,
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
 
     stringDraw(WMWidgetScreen(table), d,
                strdata->gc, strdata->selGC, strdata->textColor, strdata->font,
@@ -262,7 +262,7 @@ beginESCellEdit(WMTableColumnDelegate *self, WMTableColumn *column, int row)
 {
     EnumSelectorData *strdata = (EnumSelectorData*)self->data;
     WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+    int data = (int)(uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
 
     wassertr(data < strdata->count);
 
@@ -284,7 +284,7 @@ endESCellEdit(WMTableColumnDelegate *self, WMTableColumn *column, int row)
     WMUnmapWidget(strdata->widget);
 
     option = WMGetPopUpButtonSelectedItem(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)option);
+    WMSetTableViewDataForCell(strdata->table, column, row, (void*)(uintptr_t)option);
 }
 
 
@@ -348,7 +348,7 @@ BSCellPainter(WMTableColumnDelegate *self, WMTableColumn *column,
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
     WMScreen *scr = WMWidgetScreen(table);
 
     if (i) {
@@ -369,7 +369,7 @@ selectedBSCellPainter(WMTableColumnDelegate *self, WMTableColumn *column,
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMTableView *table = WMGetTableColumnTableView(column);
-    int i = (int)WMTableViewDataForCell(table, column, row);
+    int i = (int)(uintptr_t)WMTableViewDataForCell(table, column, row);
     WMScreen *scr = WMWidgetScreen(table);
 
     if (i) {
@@ -390,7 +390,7 @@ beginBSCellEdit(WMTableColumnDelegate *self, WMTableColumn *column, int row)
 {
     BooleanSwitchData *strdata = (BooleanSwitchData*)self->data;
     WMRect rect = WMTableViewRectForCell(strdata->table, column, row);
-    int data = (int)WMTableViewDataForCell(strdata->table, column, row);
+    int data = (int)(uintptr_t)WMTableViewDataForCell(strdata->table, column, row);
 
     WMSetButtonSelected(strdata->widget, data);
     WMMoveWidget(strdata->widget, rect.pos.x+1, rect.pos.y+1);
@@ -407,7 +407,7 @@ endBSCellEdit(WMTableColumnDelegate *self, WMTableColumn *column, int row)
     int value;
 
     value = WMGetButtonSelected(strdata->widget);
-    WMSetTableViewDataForCell(strdata->table, column, row, (void*)value);
+    WMSetTableViewDataForCell(strdata->table, column, row, (void*)(uintptr_t)value);
     WMUnmapWidget(strdata->widget);
 }
 

WINGs/Extras/wtableview.c

@@ -2,6 +2,7 @@
 
 #include <WINGs/WINGsP.h>
 #include <X11/cursorfont.h>
+#include <stdint.h>
 
 #include "wtableview.h"
 
@@ -1028,7 +1029,7 @@ drawRow(WMTableView *table, int row, WMRect clipRect)
         if (!column->delegate || !column->delegate->drawCell)
             continue;
 
-        if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound)
+        if (WMFindInArray(table->selectedRows, NULL, (void*)(uintptr_t)row) != WANotFound)
             (*column->delegate->drawSelectedCell)(column->delegate, column, row, d);
         else
             (*column->delegate->drawCell)(column->delegate, column, row, d);
@@ -1064,14 +1065,14 @@ setRowSelected(WMTableView *table, unsigned row, Bool flag)
 {
     int repaint = 0;
 
-    if (WMFindInArray(table->selectedRows, NULL, (void*)row) != WANotFound) {
+    if (WMFindInArray(table->selectedRows, NULL, (void*)(uintptr_t)row) != WANotFound) {
         if (!flag) {
-            WMRemoveFromArray(table->selectedRows, (void*)row);
+            WMRemoveFromArray(table->selectedRows, (void*)(uintptr_t)row);
             repaint = 1;
         }
     } else {
         if (flag) {
-            WMAddToArray(table->selectedRows, (void*)row);
+            WMAddToArray(table->selectedRows, (void*)(uintptr_t)row);
             repaint = 1;
         }
     }