dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 1104:84473658ce37

Cleaned up warnings building GTK2 on 64bit.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Tue, 26 Jul 2011 05:40:47 +0000
parents	99899e6b51c2
children	884951ef2e7f

comparison

equal deleted inserted replaced

-:bf932c9316ff
+:84473658ce37
 {
 char *data = NULL;
 int z, id = GPOINTER_TO_INT(icon);
 if(id & (1 << 31))
-return _find_private_pixmap(bitmap, (HICN)(id & 0xFFFFFF), userwidth, userheight);
+return _find_private_pixmap(bitmap, GINT_TO_POINTER((id & 0xFFFFFF)), userwidth, userheight);
 for(z=0;z<_resources.resource_max;z++)
 {
 if(_resources.resource_id[z] == id)
 {
 {
 char *data = NULL;
 int z, id = GPOINTER_TO_INT(icon);
 if(id & (1 << 31))
-return _find_private_pixbuf((HICN)(id & 0xFFFFFF));
+return _find_private_pixbuf(GINT_TO_POINTER((id & 0xFFFFFF)));
 for(z=0;z<_resources.resource_max;z++)
 {
 if(_resources.resource_id[z] == id)
 {
 DW_MUTEX_LOCK;
 if(pointertype & (1 << 31))
 {
 GdkBitmap *bitmap = NULL;
-GdkPixmap  *pixmap = _find_private_pixmap(&bitmap, (HICN)(pointertype & 0xFFFFFF), NULL, NULL);
+GdkPixmap  *pixmap = _find_private_pixmap(&bitmap, GINT_TO_POINTER((pointertype & 0xFFFFFF)), NULL, NULL);
 cursor = gdk_cursor_new_from_pixmap(pixmap, (GdkPixmap *)bitmap, &_colors[DW_CLR_WHITE], &_colors[DW_CLR_BLACK], 8, 8);
 }
 else if(!pointertype)
 cursor = NULL;
 else
 pixbuf = _find_pixbuf(icon);
 gtk_tree_store_insert_after(store, iter, (GtkTreeIter *)parent, (GtkTreeIter *)item);
 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
-if(pixbuf && !((int)icon & (1 << 31)))
+if(pixbuf && !(GPOINTER_TO_INT(icon) & (1 << 31)))
 g_object_unref(pixbuf);
 retval = (HTREEITEM)iter;
 }
 DW_MUTEX_UNLOCK;
 pixbuf = _find_pixbuf(icon);
 gtk_tree_store_append (store, iter, (GtkTreeIter *)parent);
 gtk_tree_store_set (store, iter, 0, title, 1, pixbuf, 2, itemdata, 3, iter, -1);
-if(pixbuf && !((int)icon & (1 << 31)))
+if(pixbuf && !(GPOINTER_TO_INT(icon) & (1 << 31)))
 g_object_unref(pixbuf);
 retval = (HTREEITEM)iter;
 }
 DW_MUTEX_UNLOCK;
 (store = (GtkTreeStore *)gtk_object_get_data(GTK_OBJECT(tree), "_dw_tree_store")))
 {
 pixbuf = _find_pixbuf(icon);
 gtk_tree_store_set(store, (GtkTreeIter *)item, 0, title, 1, pixbuf, -1);
-if(pixbuf && !((int)icon & (1 << 31)))
+if(pixbuf && !(GPOINTER_TO_INT(icon) & (1 << 31)))
 g_object_unref(pixbuf);
 }
 DW_MUTEX_UNLOCK;
 #else
 GtkWidget *label, *hbox, *pixmap;
 {
 /* If it is a private icon, find the item
 * free the associated structures and set
 * the entry to unused.
 */
-if((int)handle & (1 << 31))
+if(GPOINTER_TO_INT(handle) & (1 << 31))
 {
-unsigned long id = (int)handle & 0xFFFFFF;
+unsigned long id = GPOINTER_TO_INT(handle) & 0xFFFFFF;
 if(id < _PixmapCount && _PixmapArray[id].used)
 {
 #if GTK_MAJOR_VERSION > 1
 if(_PixmapArray[id].pixbuf)
 return NULL;
 }
 /* Create a thread to handle this event semaphore */
 pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
-return (HEV)ev;
+return GINT_TO_POINTER(ev);
 }
 /* Open an already existing named event semaphore.
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 un.sun_family=AF_UNIX;
 mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
 strcpy(un.sun_path, "/tmp/.dw/");
 strcat(un.sun_path, name);
 connect(ev, (struct sockaddr *)&un, sizeof(un));
-return (HEV)ev;
+return GINT_TO_POINTER(ev);
 }
 /* Resets the event semaphore so threads who call wait
 * on this semaphore will block.
 * Parameters:
 int dw_named_event_reset(HEV eve)
 {
 /* signal reset */
 char tmp = (char)0;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
 return 0;
-if(write((int)eve, &tmp, 1) == 1)
+if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
 return 0;
 return 1;
 }
 /* Sets the posted state of an event semaphore, any threads
 {
 /* signal post */
 char tmp = (char)1;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
 return 0;
-if(write((int)eve, &tmp, 1) == 1)
+if(write(GPOINTER_TO_INT(eve), &tmp, 1) == 1)
 return 0;
 return 1;
 }
 /* Waits on the specified semaphore until it becomes
 fd_set rd;
 struct timeval tv, *useme;
 int retval = 0;
 char tmp;
-if((int)eve < 0)
+if(GPOINTER_TO_INT(eve) < 0)
 return DW_ERROR_NON_INIT;
 /* Set the timout or infinite */
 if(timeout == -1)
 useme = NULL;
 useme = &tv;
 }
 FD_ZERO(&rd);
-FD_SET((int)eve, &rd);
+FD_SET(GPOINTER_TO_INT(eve), &rd);
 /* Signal wait */
 tmp = (char)2;
-write((int)eve, &tmp, 1);
+write(GPOINTER_TO_INT(eve), &tmp, 1);
-retval = select((int)eve+1, &rd, NULL, NULL, useme);
+retval = select(GPOINTER_TO_INT(eve)+1, &rd, NULL, NULL, useme);
 /* Signal done waiting. */
 tmp = (char)3;
-write((int)eve, &tmp, 1);
+write(GPOINTER_TO_INT(eve), &tmp, 1);
 if(retval == 0)
 return DW_ERROR_TIMEOUT;
 else if(retval == -1)
 return DW_ERROR_INTERRUPT;
 /* Clear the entry from the pipe so
 * we don't loop endlessly. :)
 */
-read((int)eve, &tmp, 1);
+read(GPOINTER_TO_INT(eve), &tmp, 1);
 return 0;
 }
 /* Release this semaphore, if there are no more open
 * handles on this semaphore the semaphore will be destroyed.
 int dw_named_event_close(HEV eve)
 {
 /* Finally close the domain socket,
 * cleanup will continue in _handle_sem.
 */
-close((int)eve);
+close(GPOINTER_TO_INT(eve));
 return 0;
 }
 /*
 * Setup thread independent color sets.
 tmp[1] = data;
 rc = pthread_create(&gtkthread, NULL, (void *)_dwthreadstart, (void *)tmp);
 if ( rc == 0 )
 return gtkthread;
-else
+return (DWTID)DW_ERROR_UNKNOWN;
-return (DWTID)rc;
 }
 /*
 * Ends execution of current thread immediately.
 */

Mercurial > dwindows

comparison gtk/dw.c @ 1104:84473658ce37