correct int->ptr->int warning on 64bit

This commit is contained in:
Jay McCarthy 2010-05-18 09:55:41 -05:00
parent ffe527417b
commit abf1be31c0
3 changed files with 9 additions and 6 deletions

View File

@ -4,6 +4,7 @@
#include <X11/IntrinsicP.h>
#include <X11/StringDefs.h>
#include <stdio.h>
#include <stdint.h>
#include <X11/Xmu/Converters.h>
#include <X11/Xmu/CharSet.h>
#include <xwToggle.h>
@ -118,7 +119,7 @@ static void on_cb(toggle,client_data,call_data)Widget toggle;XtPointer client_
#endif
{
Widget self = XtParent(toggle);
Cardinal toggle_ord = (Cardinal) client_data;
uintptr_t toggle_ord = (uintptr_t) client_data;
Cardinal t, i, bits = sizeof(((XfwfGroupWidget)self)->xfwfGroup.selection) * 8;
switch (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle) {
@ -150,7 +151,7 @@ static void off_cb(toggle,client_data,call_data)Widget toggle;XtPointer client
#endif
{
Widget self = XtParent(toggle);
Cardinal toggle_ord = (Cardinal) client_data;
uintptr_t toggle_ord = (uintptr_t) client_data;
Cardinal bits = sizeof(((XfwfGroupWidget)self)->xfwfGroup.selection) * 8;
switch (((XfwfGroupWidget)self)->xfwfGroup.selectionStyle) {

View File

@ -139,7 +139,7 @@ visible.
assigned to the next child that is a toggle button. The first toggle
will be number 0.
@var Cardinal toggle_ord
@var uintptr_t toggle_ord
@METHODS
@ -290,7 +290,7 @@ callbacks are called.
@proc on_cb(Widget toggle, XtPointer client_data, XtPointer call_data)
{
Widget $ = XtParent(toggle);
Cardinal toggle_ord = (Cardinal) client_data;
uintptr_t toggle_ord = (uintptr_t) client_data;
Cardinal t, i, bits = sizeof($selection) * 8;
switch ($selectionStyle) {
@ -323,7 +323,7 @@ be turned off, except by turning on another one.
@proc off_cb(Widget toggle, XtPointer client_data, XtPointer call_data)
{
Widget $ = XtParent(toggle);
Cardinal toggle_ord = (Cardinal) client_data;
uintptr_t toggle_ord = (uintptr_t) client_data;
Cardinal bits = sizeof($selection) * 8;
switch ($selectionStyle) {
@ -443,6 +443,7 @@ two resources.
@IMPORTS
@incl <stdio.h>
@incl <stdint.h>
@incl <X11/Xmu/Converters.h>
@incl <X11/Xmu/CharSet.h>
@incl <xwToggle.h>

View File

@ -5,6 +5,7 @@
#define ___XWGROUPP_H
#include <./xwRowColP.h>
#include <./xwGroup.h>
#include <stdint.h>
_XFUNCPROTOBEGIN
typedef struct {
@ -33,7 +34,7 @@ long selection;
XtCallbackList activate;
/* private state */
GC textgc;
Cardinal toggle_ord;
uintptr_t toggle_ord;
} XfwfGroupPart;
typedef struct _XfwfGroupRec {