dwindows: gtk/dw.c comparison

comparison gtk/dw.c @ 1091:99899e6b51c2

Fixed problem with missing menubar on GTK2. Also switched to using GPOINTER_TO_INT() and GINT_TO_POINTER() to avoid compiler warnings on 64bit systems in *most* places. There are still some more complicated warnings to go... maybe we need similar macros to avoid warnings on the other platforms as well.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Wed, 29 Jun 2011 17:35:00 +0000
parents	97c221691665
children	84473658ce37

comparison

equal deleted inserted replaced

-:b905fd8e7fd1
+:99899e6b51c2
 return NULL;
 }
 static SignalHandler _get_signal_handler(GtkWidget *widget, gpointer data)
 {
-int counter = (int)data;
+int counter = GPOINTER_TO_INT(data);
 SignalHandler sh;
 char text[100];
 sprintf(text, "_dw_sigwindow%d", counter);
 sh.window = (HWND)gtk_object_get_data(GTK_OBJECT(widget), text);
 sprintf(text, "_dw_intfunc%d", counter);
 sh.intfunc = (void *)gtk_object_get_data(GTK_OBJECT(widget), text);
 sprintf(text, "_dw_sigdata%d", counter);
 sh.data = gtk_object_get_data(GTK_OBJECT(widget), text);
 sprintf(text, "_dw_sigcid%d", counter);
-sh.cid = (gint)gtk_object_get_data(GTK_OBJECT(widget), text);
+sh.cid = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), text));
 return sh;
 }
 static void _remove_signal_handler(GtkWidget *widget, int counter)
 {
 char text[100];
 gint cid;
 sprintf(text, "_dw_sigcid%d", counter);
-cid = (gint)gtk_object_get_data(GTK_OBJECT(widget), text);
+cid = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), text));
 gtk_signal_disconnect(GTK_OBJECT(widget), cid);
 gtk_object_set_data(GTK_OBJECT(widget), text, NULL);
 sprintf(text, "_dw_sigwindow%d", counter);
 gtk_object_set_data(GTK_OBJECT(widget), text, NULL);
 sprintf(text, "_dw_sigfunc%d", counter);
 gtk_object_set_data(GTK_OBJECT(widget), text, NULL);
 }
 static int _set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc)
 {
-int counter = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_sigcounter");
+int counter = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), "_dw_sigcounter"));
 char text[100];
 sprintf(text, "_dw_sigwindow%d", counter);
 gtk_object_set_data(GTK_OBJECT(widget), text, (gpointer)window);
 sprintf(text, "_dw_sigfunc%d", counter);
 return FALSE;
 }
 static GdkPixmap *_find_private_pixmap(GdkBitmap **bitmap, HICN icon, unsigned long *userwidth, unsigned long *userheight)
 {
-int id = (int)icon;
+int id = GPOINTER_TO_INT(icon);
 if(id < _PixmapCount && _PixmapArray[id].used)
 {
 *bitmap = _PixmapArray[id].mask;
 if(userwidth)
 }
 static GdkPixmap *_find_pixmap(GdkBitmap **bitmap, HICN icon, HWND handle, unsigned long *userwidth, unsigned long *userheight)
 {
 char *data = NULL;
-int z, id = (int)icon;
+int z, id = GPOINTER_TO_INT(icon);
 if(id & (1 << 31))
 return _find_private_pixmap(bitmap, (HICN)(id & 0xFFFFFF), userwidth, userheight);
 for(z=0;z<_resources.resource_max;z++)
 }
 #if GTK_MAJOR_VERSION > 1
 static GdkPixbuf *_find_private_pixbuf(HICN icon)
 {
-int id = (int)icon;
+int id = GPOINTER_TO_INT(icon);
 if(id < _PixmapCount && _PixmapArray[id].used)
 return _PixmapArray[id].pixbuf;
 return NULL;
 }
 static GdkPixbuf *_find_pixbuf(HICN icon)
 {
 char *data = NULL;
-int z, id = (int)icon;
+int z, id = GPOINTER_TO_INT(icon);
 if(id & (1 << 31))
 return _find_private_pixbuf((HICN)(id & 0xFFFFFF));
 for(z=0;z<_resources.resource_max;z++)
 dw_window_set_pos_size(entrywindow, x, y, (text_width+60+extra_width), height);
 dw_window_show(entrywindow);
-return (int)dw_dialog_wait(dwwait);
+return GPOINTER_TO_INT(dw_dialog_wait(dwwait));
 }
 /*
 * Minimizes or Iconifies a top-level window.
 * Parameters:
 else
 #endif
 {
 if (GTK_WIDGET(handle)->window)
 {
-int width = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_width");
+int width = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), "_dw_width"));
-int height = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_height");
+int height = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), "_dw_height"));
 if (width && height)
 {
 gtk_widget_set_usize(handle, width, height);
 gtk_object_set_data(GTK_OBJECT(handle), "_dw_width", GINT_TO_POINTER(0));
 _save_gdk_colors(handle, forecolor, backcolor);
 if(GTK_IS_CLIST(handle))
 {
-int z, rowcount = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_rowcount");
+int z, rowcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), "_dw_rowcount"));
 for(z=0;z<rowcount;z++)
 {
 gtk_clist_set_foreground(GTK_CLIST(handle), z, &forecolor);
 gtk_clist_set_background(GTK_CLIST(handle), z, &backcolor);
 DW_MUTEX_LOCK;
 accel = _removetilde(tempbuf, title);
 accel_group = (GtkAccelGroup *)gtk_object_get_data(GTK_OBJECT(menu), "_dw_accel");
-submenucount = (int)gtk_object_get_data(GTK_OBJECT(menu), "_dw_submenucount");
+submenucount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(menu), "_dw_submenucount"));
 if (strlen(tempbuf) == 0)
 tmphandle=gtk_menu_item_new();
 else
 {
 sprintf(tempbuf, "_dw_submenu%d", submenucount);
 submenucount++;
 gtk_menu_item_set_submenu(GTK_MENU_ITEM(tmphandle), submenu);
 gtk_object_set_data(GTK_OBJECT(menu), tempbuf, (gpointer)submenu);
-gtk_object_set_data(GTK_OBJECT(menu), "_dw_submenucount", (gpointer)submenucount);
+gtk_object_set_data(GTK_OBJECT(menu), "_dw_submenucount", GINT_TO_POINTER(submenucount));
 }
 if (GTK_IS_MENU_BAR(menu))
 gtk_menu_bar_append(GTK_MENU_BAR(menu), tmphandle);
 else
 }
 GtkWidget *_find_submenu_id(GtkWidget *start, char *name)
 {
 GtkWidget *tmp;
-int z, submenucount = (int)gtk_object_get_data(GTK_OBJECT(start), "_dw_submenucount");
+int z, submenucount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(start), "_dw_submenucount"));
 if((tmp = gtk_object_get_data(GTK_OBJECT(start), name)))
 return tmp;
 for(z=0;z<submenucount;z++)
 gtk_object_set_user_data(GTK_OBJECT(tmp), NULL);
 gtk_widget_show(tmp);
 gtk_object_set_data(GTK_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id));
 sigid = _set_signal_handler(GTK_COMBO(tmp)->list, tmp, NULL, NULL, NULL);
-cid = gtk_signal_connect(GTK_OBJECT(GTK_COMBO(tmp)->list), "select_child", GTK_SIGNAL_FUNC(_item_select_event), (gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(GTK_COMBO(tmp)->list), "select_child", GTK_SIGNAL_FUNC(_item_select_event), GINT_TO_POINTER(sigid));
 _set_signal_handler_id(GTK_COMBO(tmp)->list, sigid, cid);
 DW_MUTEX_UNLOCK;
 return tmp;
 }
 }
 while(list)
 {
 if(GTK_IS_WIDGET(list->data))
 {
-if(id == (int)gtk_object_get_data(GTK_OBJECT(list->data), "_dw_id"))
+if(id == GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(list->data), "_dw_id")))
 {
 HWND ret = (HWND)list->data;
 g_list_free(orig);
 DW_MUTEX_UNLOCK;
 return ret;
 if(!clist)
 {
 DW_MUTEX_UNLOCK;
 return DW_ERROR_GENERAL;
 }
-multi = (int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_multi");
+multi = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), "_dw_multi"));
 gtk_object_set_data(GTK_OBJECT(handle), "_dw_multi", GINT_TO_POINTER(multi));
 gtk_clist_set_column_auto_resize(GTK_CLIST(clist), 0, TRUE);
 if(multi)
 gtk_clist_set_selection_mode(GTK_CLIST(clist), GTK_SELECTION_EXTENDED);
 {
 DW_MUTEX_UNLOCK;
 return NULL;
 }
-count = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_colcount");
+count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_colcount"));
-prevrowcount = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount");
+prevrowcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount"));
 if(!count)
 {
 DW_MUTEX_UNLOCK;
 return NULL;
 DW_MUTEX_UNLOCK;
 return;
 }
 sprintf(numbuf, "%d", column);
-flag = (int)gtk_object_get_data(GTK_OBJECT(clist), numbuf);
+flag = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), numbuf));
 if(pointer)
 {
-row += (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_insertpos");
+row += GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_insertpos"));
 }
 if(flag & DW_CFA_BITMAPORICON)
 {
 HICN hicon = *((HICN *)data);
 DW_MUTEX_UNLOCK;
 return 0;
 }
 sprintf(numbuf, "%d", column);
-flag = (int)gtk_object_get_data(GTK_OBJECT(clist), numbuf);
+flag = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), numbuf));
 if(flag & DW_CFA_BITMAPORICON)
 rc = DW_CFA_BITMAPORICON;
 else if(flag & DW_CFA_STRING)
 rc = DW_CFA_STRING;
 DW_MUTEX_LOCK;
 clist = (GtkWidget *)gtk_object_get_user_data(GTK_OBJECT(handle));
 if(pointer)
 {
-row += (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_insertpos");
+row += GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_insertpos"));
 }
 if(clist)
 gtk_clist_set_row_data(GTK_CLIST(clist), row, (gpointer)title);
 DW_MUTEX_UNLOCK;
 clist = (GtkWidget*)gtk_object_get_user_data(GTK_OBJECT(handle));
 if(clist && GTK_IS_CLIST(clist))
 {
 int rows, z;
-rows = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount");
+rows = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount"));
 _dw_unselect(clist);
 for(z=0;z<rowcount;z++)
 gtk_clist_remove(GTK_CLIST(clist), 0);
 {
 list = GTK_CLIST(clist)->selection;
 if(list)
 {
-int counter = 0, pos = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_querypos");
+int counter = 0, pos = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_querypos"));
 gtk_object_set_data(GTK_OBJECT(clist), "_dw_querypos", GINT_TO_POINTER(pos+1));
 while(list && counter < pos)
 {
 list = list->next;
 */
 retval = NULL;
 }
 else
 {
-int pos = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_querypos");
+int pos = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_querypos"));
 retval = (char *)gtk_clist_get_row_data(GTK_CLIST(clist), pos);
 gtk_object_set_data(GTK_OBJECT(clist), "_dw_querypos", GINT_TO_POINTER(pos+1));
 }
 DW_MUTEX_UNLOCK;
 if(!clist)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-rowcount = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount");
+rowcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount"));
 for(z=0;z<rowcount;z++)
 {
 rowdata = gtk_clist_get_row_data(GTK_CLIST(clist), z);
 if(rowdata == text)
 if(!clist)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-rowcount = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount");
+rowcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_rowcount"));
 for(z=0;z<rowcount;z++)
 {
 rowdata = gtk_clist_get_row_data(GTK_CLIST(clist), z);
 if(rowdata == text)
 if(!clist)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-colcount = (int)gtk_object_get_data(GTK_OBJECT(clist), "_dw_colcount");
+colcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(clist), "_dw_colcount"));
 for(z=0;z<colcount;z++)
 {
 int width = gtk_clist_optimal_column_width(GTK_CLIST(clist), z);
 gtk_clist_set_column_width(GTK_CLIST(clist), z, width);
 }
 /* Internal box packing function called by the other 3 functions */
 void _dw_box_pack(HWND box, HWND item, int index, int width, int height, int hsize, int vsize, int pad, char *funcname)
 {
 int warn = FALSE, _locked_by_me = FALSE;
-GtkWidget *tmp, *tmpitem, *image = NULL;
+GtkWidget *tmp, *tmpitem;
 if(!box)
 return;
 /*
 return;
 }
 DW_MUTEX_LOCK;
-if((tmp  = g_object_get_data(G_OBJECT(box), "_dw_boxhandle")))
+if((tmp  = gtk_object_get_data(GTK_OBJECT(box), "_dw_boxhandle")))
 box = tmp;
 if(!item)
 {
 item = gtk_label_new("");
 gtk_widget_show_all(item);
 }
-else if((image = g_object_get_data(G_OBJECT(item), "_dw_bitmap")))
-{
+tmpitem = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_boxhandle");
-GdkPixbuf *pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(image));
-if(pixbuf)
-{
-int pwidth = gdk_pixbuf_get_width(pixbuf);
-int pheight = gdk_pixbuf_get_height(pixbuf);
-if(pwidth > width || pheight > height)
-{
-pixbuf = gdk_pixbuf_scale_simple(pixbuf, pwidth > width ? width : pwidth, pheight > height ? height : pheight, GDK_INTERP_BILINEAR);
-gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
-}
-}
-}
-tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle");
 if(GTK_IS_TABLE(box))
 {
-int boxcount = (int)g_object_get_data(G_OBJECT(box), "_dw_boxcount");
+int boxcount = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(box), "_dw_boxcount"));
-int boxtype = (int)g_object_get_data(G_OBJECT(box), "_dw_boxtype");
+int boxtype = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(box), "_dw_boxtype"));
 int x, y;
 /* If the item being packed is a box, then we use it's padding
 * instead of the padding specified on the pack line, this is
 * due to a bug in the OS/2 and Win32 renderer and a limitation
 * of the GtkTable class.
 */
 if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 {
-GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_eventbox");
+GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 /* NOTE: I left in the ability to pack boxes with a size,
 *       this eliminates that by forcing the size to 0.
 */
 height = width = 0;
 if(eventbox)
 {
-int boxpad = (int)g_object_get_data(G_OBJECT(item), "_dw_boxpad");
+int boxpad = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"));
 gtk_container_add(GTK_CONTAINER(eventbox), item);
 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad);
 item = eventbox;
 }
 }
 gtk_object_set_data(GTK_OBJECT(box), "_dw_boxcount", GINT_TO_POINTER(boxcount + 1));
 gtk_widget_set_usize(item, width, height);
 if(GTK_IS_RADIO_BUTTON(item))
 {
 GSList *group;
-GtkWidget *groupstart = (GtkWidget *)g_object_get_data(G_OBJECT(box), "_dw_group");
+GtkWidget *groupstart = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(box), "_dw_group");
 if(groupstart)
 {
 group = gtk_radio_button_get_group(GTK_RADIO_BUTTON(groupstart));
 gtk_radio_button_set_group(GTK_RADIO_BUTTON(item), group);
 }
 else
-g_object_set_data(G_OBJECT(box), "_dw_group", (gpointer)item);
+gtk_object_set_data(GTK_OBJECT(box), "_dw_group", (gpointer)item);
 }
 }
 else
 {
-GtkWidget *vbox = g_object_get_data(G_OBJECT(box), "_dw_vbox");
+GtkWidget *vbox = gtk_object_get_data(GTK_OBJECT(box), "_dw_vbox");
 if(!vbox)
 {
 vbox = gtk_vbox_new(FALSE, 0);
-g_object_set_data(G_OBJECT(box), "_dw_vbox", vbox);
+gtk_object_set_data(GTK_OBJECT(box), "_dw_vbox", vbox);
 gtk_container_add(GTK_CONTAINER(box), vbox);
 gtk_widget_show(vbox);
 }
 gtk_container_set_border_width(GTK_CONTAINER(box), pad);
 if(GTK_IS_TABLE(item) || (tmpitem && GTK_IS_TABLE(tmpitem)))
 {
-GtkWidget *eventbox = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_eventbox");
+GtkWidget *eventbox = (GtkWidget *)gtk_object_get_data(GTK_OBJECT(item), "_dw_eventbox");
 /* NOTE: I left in the ability to pack boxes with a size,
 *       this eliminates that by forcing the size to 0.
 */
 height = width = 0;
 if(eventbox)
 {
-int boxpad = (int)g_object_get_data(G_OBJECT(item), "_dw_boxpad");
+int boxpad = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(item), "_dw_boxpad"));
 gtk_container_add(GTK_CONTAINER(eventbox), item);
 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad);
 item = eventbox;
 }
 }
 }
 gtk_box_pack_end(GTK_BOX(vbox), item, TRUE, TRUE, 0);
 gtk_widget_set_usize(item, width, height);
-g_object_set_data(G_OBJECT(box), "_dw_user", vbox);
+gtk_object_set_user_data(GTK_OBJECT(box), vbox);
 }
 DW_MUTEX_UNLOCK;
 if(warn)
 {
 {
 char ptext[100];
 int num;
 sprintf(ptext, "_dw_page%d", (int)pageid);
-num = (int)gtk_object_get_data(GTK_OBJECT(handle), ptext);
+num = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), ptext));
 realpage = 0xFF & num;
 }
 if(realpage > -1 && realpage < 256)
 {
 int num, z, realpage = -1, pad, _locked_by_me = FALSE;
 char ptext[100];
 DW_MUTEX_LOCK;
 sprintf(ptext, "_dw_page%d", (int)pageid);
-num = (int)gtk_object_get_data(GTK_OBJECT(handle), ptext);
+num = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(handle), ptext));
 gtk_object_set_data(GTK_OBJECT(handle), ptext, NULL);
 pagearray = (GtkWidget **)gtk_object_get_data(GTK_OBJECT(handle), "_dw_pagearray");
 if(!pagearray)
 {
 label = gtk_label_new(text ? text : "");
 if(GTK_IS_TABLE(page))
 {
-pad = (int)gtk_object_get_data(GTK_OBJECT(page), "_dw_boxpad");
+pad = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(page), "_dw_boxpad"));
 gtk_container_border_width(GTK_CONTAINER(page), pad);
 }
 if(realpage != -1)
 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage);
 if(tmp)
 handle2 = tmp;
 }
 else if(GTK_IS_COMBO(handle))
 {
-retval = (unsigned int)gtk_object_get_data(GTK_OBJECT(handle), "_dw_item");
+retval = GPOINTER_TO_UINT(gtk_object_get_data(GTK_OBJECT(handle), "_dw_item"));
 DW_MUTEX_UNLOCK;
 return retval;
 }
 if(GTK_IS_LIST(handle2))
 {
 /* Reposition the bar according to the percentage */
 static gint _splitbar_size_allocate(GtkWidget *widget, GtkAllocation *event, gpointer data)
 {
 float *percent = (float *)gtk_object_get_data(GTK_OBJECT(widget), "_dw_percent");
-int lastwidth = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastwidth");
+int lastwidth = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastwidth"));
-int lastheight = (int)gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastheight");
+int lastheight = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(widget), "_dw_lastheight"));
 /* Prevent infinite recursion ;) */
 if(!percent || (lastwidth == event->width && lastheight == event->height))
 return FALSE;
 else if (GTK_IS_TREE_VIEW(thiswindow)  && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0)
 {
 thisfunc = _findsigfunc("tree-context");
 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc);
-cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), (gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), GINT_TO_POINTER(sigid));
 _set_signal_handler_id(thiswindow, sigid, cid);
 #if 0
 sigid = _set_signal_handler(window, window, sigfunc, data, thisfunc);
 cid = gtk_signal_connect(GTK_OBJECT(window), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), (gpointer)sigid);
 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow));
 thisname = "changed";
 sigid = _set_signal_handler(treeview, window, sigfunc, data, thisfunc);
-cid = g_signal_connect(G_OBJECT(thiswindow), thisname, (GCallback)thisfunc, (gpointer)sigid);
+cid = g_signal_connect(G_OBJECT(thiswindow), thisname, (GCallback)thisfunc, GINT_TO_POINTER(sigid));
 _set_signal_handler_id(treeview, sigid, cid);
 DW_MUTEX_UNLOCK;
 return;
 }
 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_TREE_EXPAND) == 0)
 thisfunc = _findsigfunc("tree-context");
 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc);
 gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_container_context_func", (gpointer)thisfunc);
 gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_container_context_data", GINT_TO_POINTER(sigid));
-cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), (gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), GINT_TO_POINTER(sigid));
 _set_signal_handler_id(thiswindow, sigid, cid);
 sigid = _set_signal_handler(window, window, sigfunc, data, thisfunc);
-cid = gtk_signal_connect(GTK_OBJECT(window), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), (gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(window), "button_press_event", GTK_SIGNAL_FUNC(thisfunc), GINT_TO_POINTER(sigid));
 _set_signal_handler_id(window, sigid, cid);
 DW_MUTEX_UNLOCK;
 return;
 }
 else if (GTK_IS_TREE(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_SELECT) == 0)
 }
 #endif
 else if (GTK_IS_CLIST(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0)
 {
 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event);
-cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "key_press_event", GTK_SIGNAL_FUNC(_container_enter_event), (gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(thiswindow), "key_press_event", GTK_SIGNAL_FUNC(_container_enter_event), GINT_TO_POINTER(sigid));
 _set_signal_handler_id(thiswindow, sigid, cid);
 thisname = "button_press_event";
 thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER);
 }
 DW_MUTEX_UNLOCK;
 return;
 }
 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc);
-cid = gtk_signal_connect(GTK_OBJECT(thiswindow), thisname, GTK_SIGNAL_FUNC(thisfunc),(gpointer)sigid);
+cid = gtk_signal_connect(GTK_OBJECT(thiswindow), thisname, GTK_SIGNAL_FUNC(thisfunc),GINT_TO_POINTER(sigid));
 _set_signal_handler_id(thiswindow, sigid, cid);
 DW_MUTEX_UNLOCK;
 }
 /*
 void *thisfunc;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 thiswindow = _find_signal_window(window, signame);
-count = (int)gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter");
+count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter"));
 thisfunc  = _findsigfunc(signame);
 for(z=0;z<count;z++)
 {
-SignalHandler sh = _get_signal_handler(thiswindow, (gpointer)z);
+SignalHandler sh = _get_signal_handler(thiswindow, GINT_TO_POINTER(z));
 if(sh.intfunc == thisfunc)
 _remove_signal_handler(thiswindow, z);
 }
 DW_MUTEX_UNLOCK;
 int z, count;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 thiswindow = _find_signal_window(window, NULL);
-count = (int)gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter");
+count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter"));
 for(z=0;z<count;z++)
 _remove_signal_handler(thiswindow, z);
 gtk_object_set_data(GTK_OBJECT(thiswindow), "_dw_sigcounter", NULL);
 DW_MUTEX_UNLOCK;
 int z, count;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 thiswindow = _find_signal_window(window, NULL);
-count = (int)gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter");
+count = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(thiswindow), "_dw_sigcounter"));
 for(z=0;z<count;z++)
 {
-SignalHandler sh = _get_signal_handler(thiswindow, (gpointer)z);
+SignalHandler sh = _get_signal_handler(thiswindow, GINT_TO_POINTER(z));
 if(sh.data == data)
 _remove_signal_handler(thiswindow, z);
 }
 DW_MUTEX_UNLOCK;

Mercurial > dwindows

comparison gtk/dw.c @ 1091:99899e6b51c2