Browse Source

* x86_64 compile fixes

peter 20 years ago
parent
commit
c93724ab47

+ 4 - 4
packages/extra/gtk2/glib/glib2.pas

@@ -206,7 +206,7 @@ end;
  *}
 function GUINT_TO_POINTER(i: guint): pointer;
 begin
-  Result:=Pointer(i);
+  Result:=Pointer(PtrInt(i));
 end;
 
 {*
@@ -1749,7 +1749,7 @@ end;
 
 function G_FLAGS_CLASS_TYPE_NAME(_class : pointer) : PGChar;
 begin
-   G_FLAGS_CLASS_TYPE_NAME:=g_type_name(G_FLAGS_TYPE(_class));
+   G_FLAGS_CLASS_TYPE_NAME:=g_type_name(G_FLAGS_TYPE(PtrInt(_class)));
 end;
 
 function G_VALUE_HOLDS_ENUM(value : pointer) : gboolean;
@@ -1776,12 +1776,12 @@ end;
 
 function GPOINTER_TO_SIZE(p: GPointer): GSize;
 begin
-  Result:=GSize(p);
+  Result:=GSize(PtrInt(p));
 end;
 
 function GSIZE_TO_POINTER(s: GSize): GPointer;
 begin
-  Result:=GPointer(s);
+  Result:=GPointer(PtrInt(s));
 end;
 
 // gvaluetypes.inc -------------------------------------------------------------

+ 3 - 3
packages/extra/gtk2/gtk+/gdk/gdktypes.inc

@@ -147,17 +147,17 @@ function GDK_NONE : TGdkAtom;
 {$IFDEF read_implementation}
 function GDK_ATOM_TO_POINTER(atom : TGdkAtom) : pointer;
 begin
-  GDK_ATOM_TO_POINTER:=Pointer(atom);
+  GDK_ATOM_TO_POINTER:=Pointer(PtrInt(atom));
 end;
 
 function GDK_POINTER_TO_ATOM(ptr : Pointer) : TGdkAtom;
 begin
-  GDK_POINTER_TO_ATOM:=TGdkAtom(ptr);
+  GDK_POINTER_TO_ATOM:=TGdkAtom(PtrInt(ptr));
 end;
 
 function _GDK_MAKE_ATOM(val : guint) : TGdkAtom;
 begin
-  _GDK_MAKE_ATOM:=TGdkAtom(GUINT_TO_POINTER(val));
+  _GDK_MAKE_ATOM:=TGdkAtom(PtrInt(GUINT_TO_POINTER(val)));
 end;
 
 function GDK_NONE : TGdkAtom;

+ 1 - 1
packages/extra/gtk2/gtk+/gtk/gtkcontainer.inc

@@ -243,7 +243,7 @@ procedure GTK_CONTAINER_WARN_INVALID_CHILD_PROPERTY_ID(
   anObject: pointer; property_id: guint; pspec : pointer);
 begin
    writeln('invalid child property id ',property_id,' ',
-     HexStr(Cardinal(anObject),8),' ',HexStr(Cardinal(pspec),8));
+     HexStr(PtrUInt(anObject),8),' ',HexStr(PtrUInt(pspec),8));
    //  G_OBJECT_WARN_INVALID_PSPEC(anObject,'child property id',property_id,pspec);
 end;
 

+ 10 - 10
packages/extra/gtk2/gtk+/gtk/gtkctree.inc

@@ -111,11 +111,11 @@ function GTK_IS_CTREE(obj: pointer) : boolean;
 function GTK_IS_CTREE_CLASS(klass: pointer) : boolean;
 function GTK_CTREE_GET_CLASS(obj: pointer) : PGtkCTreeClass;
 
-function GTK_CTREE_ROW(_node_ : longint) : PGtkCTreeRow;
-function GTK_CTREE_NODE(_node_ : longint) : PGtkCTreeNode;
-function GTK_CTREE_NODE_NEXT(_nnode_ : longint) : PGtkCTreeNode;
-function GTK_CTREE_NODE_PREV(_pnode_ : longint) : PGtkCTreeNode;
-function GTK_CTREE_FUNC(_func_ : longint) : TGtkCTreeFunc;
+function GTK_CTREE_ROW(_node_ : ptrint) : PGtkCTreeRow;
+function GTK_CTREE_NODE(_node_ : ptrint) : PGtkCTreeNode;
+function GTK_CTREE_NODE_NEXT(_nnode_ : ptrint) : PGtkCTreeNode;
+function GTK_CTREE_NODE_PREV(_pnode_ : ptrint) : PGtkCTreeNode;
+function GTK_CTREE_FUNC(_func_ : ptrint) : TGtkCTreeFunc;
 function GTK_TYPE_CTREE_NODE : GType;
 
 function line_style(var a : TGtkCTree) : guint;
@@ -273,27 +273,27 @@ begin
    GTK_CTREE_GET_CLASS:=PGtkCTreeClass(GTK_CHECK_GET_CLASS(obj,GTK_TYPE_CTREE));
 end;
 
-function GTK_CTREE_ROW(_node_ : longint) : PGtkCTreeRow;
+function GTK_CTREE_ROW(_node_ : ptrint) : PGtkCTreeRow;
 begin
    GTK_CTREE_ROW:=PGtkCTreeRow((PGList(_node_))^.data);
 end;
 
-function GTK_CTREE_NODE(_node_ : longint) : PGtkCTreeNode;
+function GTK_CTREE_NODE(_node_ : ptrint) : PGtkCTreeNode;
 begin
    GTK_CTREE_NODE:=PGtkCTreeNode(_node_);
 end;
 
-function GTK_CTREE_NODE_NEXT(_nnode_ : longint) : PGtkCTreeNode;
+function GTK_CTREE_NODE_NEXT(_nnode_ : ptrint) : PGtkCTreeNode;
 begin
    GTK_CTREE_NODE_NEXT:=PGtkCTreeNode((PGList(_nnode_))^.next);
 end;
 
-function GTK_CTREE_NODE_PREV(_pnode_ : longint) : PGtkCTreeNode;
+function GTK_CTREE_NODE_PREV(_pnode_ : ptrint) : PGtkCTreeNode;
 begin
    GTK_CTREE_NODE_PREV:=PGtkCTreeNode((PGList(_pnode_))^.prev);
 end;
 
-function GTK_CTREE_FUNC(_func_ : longint) : TGtkCTreeFunc;
+function GTK_CTREE_FUNC(_func_ : ptrint) : TGtkCTreeFunc;
 begin
    GTK_CTREE_FUNC:=TGtkCTreeFunc(_func_);
 end;