Mercurial > dwindows
comparison gtk3/dw.c @ 1092:0fc7387abfd1
Similar GTK3 changes to what I just committed for GTK2, to avoid casting warnings on 64bit.
I don't currently have a 64bit test machine for GTK3... so just doing basically the same
thing on GTK3 as GTK2 to catch the... "low hanging fruit" so to speak. ;)
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 29 Jun 2011 18:29:01 +0000 |
parents | 173e49c2270f |
children | 5261439c7227 |
comparison
equal
deleted
inserted
replaced
1091:99899e6b51c2 | 1092:0fc7387abfd1 |
---|---|
1134 return NULL; | 1134 return NULL; |
1135 } | 1135 } |
1136 | 1136 |
1137 static SignalHandler _get_signal_handler(GtkWidget *widget, gpointer data) | 1137 static SignalHandler _get_signal_handler(GtkWidget *widget, gpointer data) |
1138 { | 1138 { |
1139 int counter = (int)data; | 1139 int counter = GPOINTER_TO_INT(data); |
1140 SignalHandler sh; | 1140 SignalHandler sh; |
1141 char text[100]; | 1141 char text[100]; |
1142 | 1142 |
1143 sprintf(text, "_dw_sigwindow%d", counter); | 1143 sprintf(text, "_dw_sigwindow%d", counter); |
1144 sh.window = (HWND)g_object_get_data(G_OBJECT(widget), text); | 1144 sh.window = (HWND)g_object_get_data(G_OBJECT(widget), text); |
1147 sprintf(text, "_dw_intfunc%d", counter); | 1147 sprintf(text, "_dw_intfunc%d", counter); |
1148 sh.intfunc = (void *)g_object_get_data(G_OBJECT(widget), text); | 1148 sh.intfunc = (void *)g_object_get_data(G_OBJECT(widget), text); |
1149 sprintf(text, "_dw_sigdata%d", counter); | 1149 sprintf(text, "_dw_sigdata%d", counter); |
1150 sh.data = g_object_get_data(G_OBJECT(widget), text); | 1150 sh.data = g_object_get_data(G_OBJECT(widget), text); |
1151 sprintf(text, "_dw_sigcid%d", counter); | 1151 sprintf(text, "_dw_sigcid%d", counter); |
1152 sh.cid = (gint)g_object_get_data(G_OBJECT(widget), text); | 1152 sh.cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text)); |
1153 | 1153 |
1154 return sh; | 1154 return sh; |
1155 } | 1155 } |
1156 | 1156 |
1157 static void _remove_signal_handler(GtkWidget *widget, int counter) | 1157 static void _remove_signal_handler(GtkWidget *widget, int counter) |
1158 { | 1158 { |
1159 char text[100]; | 1159 char text[100]; |
1160 gint cid; | 1160 gint cid; |
1161 | 1161 |
1162 sprintf(text, "_dw_sigcid%d", counter); | 1162 sprintf(text, "_dw_sigcid%d", counter); |
1163 cid = (gint)g_object_get_data(G_OBJECT(widget), text); | 1163 cid = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), text)); |
1164 g_signal_handler_disconnect(G_OBJECT(widget), cid); | 1164 g_signal_handler_disconnect(G_OBJECT(widget), cid); |
1165 g_object_set_data(G_OBJECT(widget), text, NULL); | 1165 g_object_set_data(G_OBJECT(widget), text, NULL); |
1166 sprintf(text, "_dw_sigwindow%d", counter); | 1166 sprintf(text, "_dw_sigwindow%d", counter); |
1167 g_object_set_data(G_OBJECT(widget), text, NULL); | 1167 g_object_set_data(G_OBJECT(widget), text, NULL); |
1168 sprintf(text, "_dw_sigfunc%d", counter); | 1168 sprintf(text, "_dw_sigfunc%d", counter); |
1173 g_object_set_data(G_OBJECT(widget), text, NULL); | 1173 g_object_set_data(G_OBJECT(widget), text, NULL); |
1174 } | 1174 } |
1175 | 1175 |
1176 static int _set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc) | 1176 static int _set_signal_handler(GtkWidget *widget, HWND window, void *func, gpointer data, void *intfunc) |
1177 { | 1177 { |
1178 int counter = (int)g_object_get_data(G_OBJECT(widget), "_dw_sigcounter"); | 1178 int counter = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_sigcounter")); |
1179 char text[100]; | 1179 char text[100]; |
1180 | 1180 |
1181 sprintf(text, "_dw_sigwindow%d", counter); | 1181 sprintf(text, "_dw_sigwindow%d", counter); |
1182 g_object_set_data(G_OBJECT(widget), text, (gpointer)window); | 1182 g_object_set_data(G_OBJECT(widget), text, (gpointer)window); |
1183 sprintf(text, "_dw_sigfunc%d", counter); | 1183 sprintf(text, "_dw_sigfunc%d", counter); |
1689 } | 1689 } |
1690 | 1690 |
1691 static gint _column_click_event(GtkWidget *widget, gpointer data) | 1691 static gint _column_click_event(GtkWidget *widget, gpointer data) |
1692 { | 1692 { |
1693 GtkWidget *tree = data; | 1693 GtkWidget *tree = data; |
1694 gint handlerdata = (gint)g_object_get_data(G_OBJECT(tree), "_dw_column_click_id"); | 1694 gint handlerdata = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(tree), "_dw_column_click_id")); |
1695 SignalHandler work; | 1695 SignalHandler work; |
1696 int retval = FALSE; | 1696 int retval = FALSE; |
1697 | 1697 |
1698 if(handlerdata) | 1698 if(handlerdata) |
1699 { | 1699 { |
1700 work = _get_signal_handler(tree, GINT_TO_POINTER(handlerdata-1)); | 1700 work = _get_signal_handler(tree, GINT_TO_POINTER(handlerdata-1)); |
1701 | 1701 |
1702 if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); | 1702 if ( dbgfp != NULL ) _dw_log("%s %d: %s\n",__FILE__,__LINE__,__func__); |
1703 if(work.window) | 1703 if(work.window) |
1704 { | 1704 { |
1705 int column_num = (int)g_object_get_data(G_OBJECT(widget), "_dw_column"); | 1705 int column_num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(widget), "_dw_column")); |
1706 int (*clickcolumnfunc)(HWND, int, void *) = work.func; | 1706 int (*clickcolumnfunc)(HWND, int, void *) = work.func; |
1707 retval = clickcolumnfunc(work.window, column_num, work.data); | 1707 retval = clickcolumnfunc(work.window, column_num, work.data); |
1708 } | 1708 } |
1709 } | 1709 } |
1710 return retval; | 1710 return retval; |
1776 } | 1776 } |
1777 | 1777 |
1778 static GdkPixbuf *_find_pixbuf(HICN icon, unsigned long *userwidth, unsigned long *userheight) | 1778 static GdkPixbuf *_find_pixbuf(HICN icon, unsigned long *userwidth, unsigned long *userheight) |
1779 { | 1779 { |
1780 char *data = NULL; | 1780 char *data = NULL; |
1781 int z, id = (int)icon; | 1781 int z, id = GPOINTER_TO_INT(icon); |
1782 | 1782 |
1783 if(id > 65535) | 1783 if(id > 65535) |
1784 { | 1784 { |
1785 GdkPixbuf *icon_pixbuf = icon; | 1785 GdkPixbuf *icon_pixbuf = icon; |
1786 | 1786 |
2308 | 2308 |
2309 dw_window_set_pos_size(entrywindow, x, y, (text_width+60+extra_width), height); | 2309 dw_window_set_pos_size(entrywindow, x, y, (text_width+60+extra_width), height); |
2310 | 2310 |
2311 dw_window_show(entrywindow); | 2311 dw_window_show(entrywindow); |
2312 | 2312 |
2313 return (int)dw_dialog_wait(dwwait); | 2313 return GPOINTER_TO_INT(dw_dialog_wait(dwwait)); |
2314 } | 2314 } |
2315 | 2315 |
2316 /* | 2316 /* |
2317 * Minimizes or Iconifies a top-level window. | 2317 * Minimizes or Iconifies a top-level window. |
2318 * Parameters: | 2318 * Parameters: |
2397 } | 2397 } |
2398 else | 2398 else |
2399 { | 2399 { |
2400 if (gtk_widget_get_window(GTK_WIDGET(handle))) | 2400 if (gtk_widget_get_window(GTK_WIDGET(handle))) |
2401 { | 2401 { |
2402 int width = (int)g_object_get_data(G_OBJECT(handle), "_dw_width"); | 2402 int width = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_width")); |
2403 int height = (int)g_object_get_data(G_OBJECT(handle), "_dw_height"); | 2403 int height = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), "_dw_height")); |
2404 | 2404 |
2405 if (width && height) | 2405 if (width && height) |
2406 { | 2406 { |
2407 gtk_widget_set_size_request(handle, width, height); | 2407 gtk_widget_set_size_request(handle, width, height); |
2408 g_object_set_data(G_OBJECT(handle), "_dw_width", GINT_TO_POINTER(0)); | 2408 g_object_set_data(G_OBJECT(handle), "_dw_width", GINT_TO_POINTER(0)); |
3329 | 3329 |
3330 DW_MUTEX_LOCK; | 3330 DW_MUTEX_LOCK; |
3331 accel = _removetilde(tempbuf, title); | 3331 accel = _removetilde(tempbuf, title); |
3332 | 3332 |
3333 accel_group = (GtkAccelGroup *)g_object_get_data(G_OBJECT(menu), "_dw_accel"); | 3333 accel_group = (GtkAccelGroup *)g_object_get_data(G_OBJECT(menu), "_dw_accel"); |
3334 submenucount = (int)g_object_get_data(G_OBJECT(menu), "_dw_submenucount"); | 3334 submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu), "_dw_submenucount")); |
3335 | 3335 |
3336 if (strlen(tempbuf) == 0) | 3336 if (strlen(tempbuf) == 0) |
3337 tmphandle=gtk_menu_item_new(); | 3337 tmphandle=gtk_menu_item_new(); |
3338 else | 3338 else |
3339 { | 3339 { |
3377 | 3377 |
3378 sprintf(tempbuf, "_dw_submenu%d", submenucount); | 3378 sprintf(tempbuf, "_dw_submenu%d", submenucount); |
3379 submenucount++; | 3379 submenucount++; |
3380 gtk_menu_item_set_submenu(GTK_MENU_ITEM(tmphandle), submenu); | 3380 gtk_menu_item_set_submenu(GTK_MENU_ITEM(tmphandle), submenu); |
3381 g_object_set_data(G_OBJECT(menu), tempbuf, (gpointer)submenu); | 3381 g_object_set_data(G_OBJECT(menu), tempbuf, (gpointer)submenu); |
3382 g_object_set_data(G_OBJECT(menu), "_dw_submenucount", (gpointer)submenucount); | 3382 g_object_set_data(G_OBJECT(menu), "_dw_submenucount", GINT_TO_POINTER(submenucount)); |
3383 } | 3383 } |
3384 | 3384 |
3385 if (GTK_IS_MENU_BAR(menu)) | 3385 if (GTK_IS_MENU_BAR(menu)) |
3386 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle); | 3386 gtk_menu_shell_append(GTK_MENU_SHELL(menu), tmphandle); |
3387 else | 3387 else |
3407 } | 3407 } |
3408 | 3408 |
3409 GtkWidget *_find_submenu_id(GtkWidget *start, char *name) | 3409 GtkWidget *_find_submenu_id(GtkWidget *start, char *name) |
3410 { | 3410 { |
3411 GtkWidget *tmp; | 3411 GtkWidget *tmp; |
3412 int z, submenucount = (int)g_object_get_data(G_OBJECT(start), "_dw_submenucount"); | 3412 int z, submenucount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(start), "_dw_submenucount")); |
3413 | 3413 |
3414 if((tmp = g_object_get_data(G_OBJECT(start), name))) | 3414 if((tmp = g_object_get_data(G_OBJECT(start), name))) |
3415 return tmp; | 3415 return tmp; |
3416 | 3416 |
3417 for(z=0;z<submenucount;z++) | 3417 for(z=0;z<submenucount;z++) |
3615 if(!(tmp = _tree_create(id))) | 3615 if(!(tmp = _tree_create(id))) |
3616 { | 3616 { |
3617 DW_MUTEX_UNLOCK; | 3617 DW_MUTEX_UNLOCK; |
3618 return 0; | 3618 return 0; |
3619 } | 3619 } |
3620 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_CONTAINER); | 3620 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)); |
3621 g_object_set_data(G_OBJECT(tmp), "_dw_multi_sel", GINT_TO_POINTER(multi)); | 3621 g_object_set_data(G_OBJECT(tmp), "_dw_multi_sel", GINT_TO_POINTER(multi)); |
3622 DW_MUTEX_UNLOCK; | 3622 DW_MUTEX_UNLOCK; |
3623 return tmp; | 3623 return tmp; |
3624 } | 3624 } |
3625 | 3625 |
3644 DW_MUTEX_UNLOCK; | 3644 DW_MUTEX_UNLOCK; |
3645 return 0; | 3645 return 0; |
3646 } | 3646 } |
3647 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER); | 3647 store = gtk_tree_store_new(4, G_TYPE_STRING, GDK_TYPE_PIXBUF, G_TYPE_POINTER, G_TYPE_POINTER); |
3648 tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); | 3648 tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); |
3649 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_TREE); | 3649 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE)); |
3650 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_TREE); | 3650 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_TREE)); |
3651 col = gtk_tree_view_column_new(); | 3651 col = gtk_tree_view_column_new(); |
3652 | 3652 |
3653 rend = gtk_cell_renderer_pixbuf_new(); | 3653 rend = gtk_cell_renderer_pixbuf_new(); |
3654 gtk_tree_view_column_pack_start(col, rend, FALSE); | 3654 gtk_tree_view_column_pack_start(col, rend, FALSE); |
3655 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", 1); | 3655 gtk_tree_view_column_add_attribute(col, rend, "pixbuf", 1); |
3811 store = gtk_list_store_new(1, G_TYPE_STRING); | 3811 store = gtk_list_store_new(1, G_TYPE_STRING); |
3812 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store)); | 3812 tmp = gtk_combo_box_new_with_model_and_entry(GTK_TREE_MODEL(store)); |
3813 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0); | 3813 gtk_combo_box_set_entry_text_column(GTK_COMBO_BOX(tmp), 0); |
3814 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), text); | 3814 gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(tmp))), text); |
3815 gtk_widget_show(tmp); | 3815 gtk_widget_show(tmp); |
3816 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_COMBOBOX); | 3816 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_COMBOBOX)); |
3817 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); | 3817 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); |
3818 DW_MUTEX_UNLOCK; | 3818 DW_MUTEX_UNLOCK; |
3819 return tmp; | 3819 return tmp; |
3820 } | 3820 } |
3821 | 3821 |
4125 DW_MUTEX_UNLOCK; | 4125 DW_MUTEX_UNLOCK; |
4126 return 0; | 4126 return 0; |
4127 } | 4127 } |
4128 store = gtk_list_store_new(1, G_TYPE_STRING); | 4128 store = gtk_list_store_new(1, G_TYPE_STRING); |
4129 tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); | 4129 tree = _tree_setup(tmp, GTK_TREE_MODEL(store)); |
4130 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_LISTBOX); | 4130 g_object_set_data(G_OBJECT(tmp), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX)); |
4131 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_LISTBOX); | 4131 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_LISTBOX)); |
4132 | 4132 |
4133 col = gtk_tree_view_column_new(); | 4133 col = gtk_tree_view_column_new(); |
4134 rend = gtk_cell_renderer_text_new(); | 4134 rend = gtk_cell_renderer_text_new(); |
4135 gtk_tree_view_column_pack_start(col, rend, TRUE); | 4135 gtk_tree_view_column_pack_start(col, rend, TRUE); |
4136 gtk_tree_view_column_add_attribute(col, rend, "text", 0); | 4136 gtk_tree_view_column_add_attribute(col, rend, "text", 0); |
4417 } | 4417 } |
4418 while(list) | 4418 while(list) |
4419 { | 4419 { |
4420 if(GTK_IS_WIDGET(list->data)) | 4420 if(GTK_IS_WIDGET(list->data)) |
4421 { | 4421 { |
4422 if(id == (int)g_object_get_data(G_OBJECT(list->data), "_dw_id")) | 4422 if(id == GPOINTER_TO_INT(g_object_get_data(G_OBJECT(list->data), "_dw_id"))) |
4423 { | 4423 { |
4424 HWND ret = (HWND)list->data; | 4424 HWND ret = (HWND)list->data; |
4425 g_list_free(orig); | 4425 g_list_free(orig); |
4426 DW_MUTEX_UNLOCK; | 4426 DW_MUTEX_UNLOCK; |
4427 return ret; | 4427 return ret; |
5436 } | 5436 } |
5437 } | 5437 } |
5438 /* Create the store and then the tree */ | 5438 /* Create the store and then the tree */ |
5439 store = gtk_list_store_newv(count+2, array); | 5439 store = gtk_list_store_newv(count+2, array); |
5440 tree = _tree_setup(handle, GTK_TREE_MODEL(store)); | 5440 tree = _tree_setup(handle, GTK_TREE_MODEL(store)); |
5441 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", (gpointer)_DW_TREE_TYPE_CONTAINER); | 5441 g_object_set_data(G_OBJECT(tree), "_dw_tree_type", GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)); |
5442 /* Second loop... create the columns */ | 5442 /* Second loop... create the columns */ |
5443 for(z=0;z<count;z++) | 5443 for(z=0;z<count;z++) |
5444 { | 5444 { |
5445 sprintf(numbuf, "_dw_cont_col%d", z); | 5445 sprintf(numbuf, "_dw_cont_col%d", z); |
5446 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z])); | 5446 g_object_set_data(G_OBJECT(tree), numbuf, GINT_TO_POINTER(flags[z])); |
5696 | 5696 |
5697 if(store) | 5697 if(store) |
5698 { | 5698 { |
5699 GtkTreeIter iter; | 5699 GtkTreeIter iter; |
5700 | 5700 |
5701 prevrowcount = (int)g_object_get_data(G_OBJECT(cont), "_dw_rowcount"); | 5701 prevrowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount")); |
5702 | 5702 |
5703 for(z=0;z<rowcount;z++) | 5703 for(z=0;z<rowcount;z++) |
5704 { | 5704 { |
5705 gtk_list_store_append(store, &iter); | 5705 gtk_list_store_append(store, &iter); |
5706 } | 5706 } |
5733 if(store) | 5733 if(store) |
5734 { | 5734 { |
5735 GtkTreeIter iter; | 5735 GtkTreeIter iter; |
5736 | 5736 |
5737 sprintf(numbuf, "_dw_cont_col%d", column); | 5737 sprintf(numbuf, "_dw_cont_col%d", column); |
5738 flag = (int)g_object_get_data(G_OBJECT(cont), numbuf); | 5738 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf)); |
5739 if(pointer) | 5739 if(pointer) |
5740 { | 5740 { |
5741 row += (int)g_object_get_data(G_OBJECT(cont), "_dw_insertpos"); | 5741 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos")); |
5742 } | 5742 } |
5743 | 5743 |
5744 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row)) | 5744 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row)) |
5745 { | 5745 { |
5746 if(flag & DW_CFA_STRINGANDICON) | 5746 if(flag & DW_CFA_STRINGANDICON) |
5911 DW_MUTEX_UNLOCK; | 5911 DW_MUTEX_UNLOCK; |
5912 return 0; | 5912 return 0; |
5913 } | 5913 } |
5914 | 5914 |
5915 sprintf(numbuf, "_dw_cont_col%d", column); | 5915 sprintf(numbuf, "_dw_cont_col%d", column); |
5916 flag = (int)g_object_get_data(G_OBJECT(cont), numbuf); | 5916 flag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), numbuf)); |
5917 | 5917 |
5918 if(flag & DW_CFA_BITMAPORICON) | 5918 if(flag & DW_CFA_BITMAPORICON) |
5919 rc = DW_CFA_BITMAPORICON; | 5919 rc = DW_CFA_BITMAPORICON; |
5920 else if(flag & DW_CFA_STRING) | 5920 else if(flag & DW_CFA_STRING) |
5921 rc = DW_CFA_STRING; | 5921 rc = DW_CFA_STRING; |
5986 { | 5986 { |
5987 GtkTreeIter iter; | 5987 GtkTreeIter iter; |
5988 | 5988 |
5989 if(pointer) | 5989 if(pointer) |
5990 { | 5990 { |
5991 row += (int)g_object_get_data(G_OBJECT(cont), "_dw_insertpos"); | 5991 row += GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_insertpos")); |
5992 } | 5992 } |
5993 | 5993 |
5994 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row)) | 5994 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, row)) |
5995 { | 5995 { |
5996 gtk_list_store_set(store, &iter, 0, (gpointer)title, -1); | 5996 gtk_list_store_set(store, &iter, 0, (gpointer)title, -1); |
6057 if(store) | 6057 if(store) |
6058 { | 6058 { |
6059 GtkTreeIter iter; | 6059 GtkTreeIter iter; |
6060 int rows, z; | 6060 int rows, z; |
6061 | 6061 |
6062 rows = (int)g_object_get_data(G_OBJECT(cont), "_dw_rowcount"); | 6062 rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount")); |
6063 | 6063 |
6064 for(z=0;z<rowcount;z++) | 6064 for(z=0;z<rowcount;z++) |
6065 { | 6065 { |
6066 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0)) | 6066 if(gtk_tree_model_iter_nth_child(GTK_TREE_MODEL(store), &iter, NULL, 0)) |
6067 gtk_list_store_remove(store, &iter); | 6067 gtk_list_store_remove(store, &iter); |
6127 { | 6127 { |
6128 GtkAdjustment *adjust = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(cont)); | 6128 GtkAdjustment *adjust = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(cont)); |
6129 | 6129 |
6130 if(adjust) | 6130 if(adjust) |
6131 { | 6131 { |
6132 gint rowcount = (gint)g_object_get_data(G_OBJECT(cont), "_dw_rowcount"); | 6132 gint rowcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount")); |
6133 gdouble currpos = gtk_adjustment_get_value(adjust); | 6133 gdouble currpos = gtk_adjustment_get_value(adjust); |
6134 gdouble upper = gtk_adjustment_get_upper(adjust); | 6134 gdouble upper = gtk_adjustment_get_upper(adjust); |
6135 gdouble lower = gtk_adjustment_get_lower(adjust); | 6135 gdouble lower = gtk_adjustment_get_lower(adjust); |
6136 gdouble change; | 6136 gdouble change; |
6137 | 6137 |
6287 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)) | 6287 if(cont && GTK_IS_TREE_VIEW(cont) && g_object_get_data(G_OBJECT(cont), "_dw_tree_type") == GINT_TO_POINTER(_DW_TREE_TYPE_CONTAINER)) |
6288 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont)); | 6288 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont)); |
6289 | 6289 |
6290 if(store) | 6290 if(store) |
6291 { | 6291 { |
6292 int pos = (int)g_object_get_data(G_OBJECT(cont), "_dw_querypos"); | 6292 int pos = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_querypos")); |
6293 int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL); | 6293 int count = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL); |
6294 | 6294 |
6295 /* These should be separate but right now this will work */ | 6295 /* These should be separate but right now this will work */ |
6296 if(flags & DW_CRA_SELECTED) | 6296 if(flags & DW_CRA_SELECTED) |
6297 { | 6297 { |
6419 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont)); | 6419 store = (GtkListStore *)gtk_tree_view_get_model(GTK_TREE_VIEW(cont)); |
6420 | 6420 |
6421 if(store) | 6421 if(store) |
6422 { | 6422 { |
6423 GtkTreeIter iter; | 6423 GtkTreeIter iter; |
6424 int rows = (int)g_object_get_data(G_OBJECT(cont), "_dw_rowcount"); | 6424 int rows = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cont), "_dw_rowcount")); |
6425 | 6425 |
6426 if(_find_iter(store, &iter, text)) | 6426 if(_find_iter(store, &iter, text)) |
6427 { | 6427 { |
6428 gtk_list_store_remove(store, &iter); | 6428 gtk_list_store_remove(store, &iter); |
6429 rows--; | 6429 rows--; |
8091 | 8091 |
8092 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle"); | 8092 tmpitem = (GtkWidget *)g_object_get_data(G_OBJECT(item), "_dw_boxhandle"); |
8093 | 8093 |
8094 if(GTK_IS_TABLE(box)) | 8094 if(GTK_IS_TABLE(box)) |
8095 { | 8095 { |
8096 int boxcount = (int)g_object_get_data(G_OBJECT(box), "_dw_boxcount"); | 8096 int boxcount = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxcount")); |
8097 int boxtype = (int)g_object_get_data(G_OBJECT(box), "_dw_boxtype"); | 8097 int boxtype = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(box), "_dw_boxtype")); |
8098 int x, y; | 8098 int x, y; |
8099 | 8099 |
8100 /* If the item being packed is a box, then we use it's padding | 8100 /* If the item being packed is a box, then we use it's padding |
8101 * instead of the padding specified on the pack line, this is | 8101 * instead of the padding specified on the pack line, this is |
8102 * due to a bug in the OS/2 and Win32 renderer and a limitation | 8102 * due to a bug in the OS/2 and Win32 renderer and a limitation |
8111 */ | 8111 */ |
8112 height = width = 0; | 8112 height = width = 0; |
8113 | 8113 |
8114 if(eventbox) | 8114 if(eventbox) |
8115 { | 8115 { |
8116 int boxpad = (int)g_object_get_data(G_OBJECT(item), "_dw_boxpad"); | 8116 int boxpad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "_dw_boxpad")); |
8117 gtk_container_add(GTK_CONTAINER(eventbox), item); | 8117 gtk_container_add(GTK_CONTAINER(eventbox), item); |
8118 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad); | 8118 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad); |
8119 item = eventbox; | 8119 item = eventbox; |
8120 } | 8120 } |
8121 } | 8121 } |
8193 */ | 8193 */ |
8194 height = width = 0; | 8194 height = width = 0; |
8195 | 8195 |
8196 if(eventbox) | 8196 if(eventbox) |
8197 { | 8197 { |
8198 int boxpad = (int)g_object_get_data(G_OBJECT(item), "_dw_boxpad"); | 8198 int boxpad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "_dw_boxpad")); |
8199 gtk_container_add(GTK_CONTAINER(eventbox), item); | 8199 gtk_container_add(GTK_CONTAINER(eventbox), item); |
8200 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad); | 8200 gtk_container_set_border_width(GTK_CONTAINER(eventbox), boxpad); |
8201 item = eventbox; | 8201 item = eventbox; |
8202 } | 8202 } |
8203 } | 8203 } |
8682 { | 8682 { |
8683 char ptext[100]; | 8683 char ptext[100]; |
8684 int num; | 8684 int num; |
8685 | 8685 |
8686 sprintf(ptext, "_dw_page%d", (int)pageid); | 8686 sprintf(ptext, "_dw_page%d", (int)pageid); |
8687 num = (int)g_object_get_data(G_OBJECT(handle), ptext); | 8687 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext)); |
8688 realpage = 0xFF & num; | 8688 realpage = 0xFF & num; |
8689 } | 8689 } |
8690 | 8690 |
8691 if(realpage > -1 && realpage < 256) | 8691 if(realpage > -1 && realpage < 256) |
8692 { | 8692 { |
8723 int num, z, realpage = -1, pad, _locked_by_me = FALSE; | 8723 int num, z, realpage = -1, pad, _locked_by_me = FALSE; |
8724 char ptext[100]; | 8724 char ptext[100]; |
8725 | 8725 |
8726 DW_MUTEX_LOCK; | 8726 DW_MUTEX_LOCK; |
8727 sprintf(ptext, "_dw_page%d", (int)pageid); | 8727 sprintf(ptext, "_dw_page%d", (int)pageid); |
8728 num = (int)g_object_get_data(G_OBJECT(handle), ptext); | 8728 num = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(handle), ptext)); |
8729 g_object_set_data(G_OBJECT(handle), ptext, NULL); | 8729 g_object_set_data(G_OBJECT(handle), ptext, NULL); |
8730 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray"); | 8730 pagearray = (GtkWidget **)g_object_get_data(G_OBJECT(handle), "_dw_pagearray"); |
8731 | 8731 |
8732 if(!pagearray) | 8732 if(!pagearray) |
8733 { | 8733 { |
8757 | 8757 |
8758 label = gtk_label_new(text ? text : ""); | 8758 label = gtk_label_new(text ? text : ""); |
8759 | 8759 |
8760 if(GTK_IS_TABLE(page)) | 8760 if(GTK_IS_TABLE(page)) |
8761 { | 8761 { |
8762 pad = (int)g_object_get_data(G_OBJECT(page), "_dw_boxpad"); | 8762 pad = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(page), "_dw_boxpad")); |
8763 gtk_container_set_border_width(GTK_CONTAINER(page), pad); | 8763 gtk_container_set_border_width(GTK_CONTAINER(page), pad); |
8764 } | 8764 } |
8765 | 8765 |
8766 if(realpage != -1) | 8766 if(realpage != -1) |
8767 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage); | 8767 gtk_notebook_insert_page(GTK_NOTEBOOK(handle), page, label, realpage); |
10409 thisfunc = _findsigfunc(thisname); | 10409 thisfunc = _findsigfunc(thisname); |
10410 } | 10410 } |
10411 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) | 10411 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_CONTEXT) == 0) |
10412 { | 10412 { |
10413 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); | 10413 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); |
10414 cid = g_signal_connect(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), (gpointer)sigid); | 10414 cid = g_signal_connect(G_OBJECT(thiswindow), "button_press_event", G_CALLBACK(thisfunc), GINT_TO_POINTER(sigid)); |
10415 _set_signal_handler_id(thiswindow, sigid, cid); | 10415 _set_signal_handler_id(thiswindow, sigid, cid); |
10416 | 10416 |
10417 DW_MUTEX_UNLOCK; | 10417 DW_MUTEX_UNLOCK; |
10418 return; | 10418 return; |
10419 } | 10419 } |
10426 | 10426 |
10427 sigid = _set_signal_handler(widget, window, sigfunc, data, thisfunc); | 10427 sigid = _set_signal_handler(widget, window, sigfunc, data, thisfunc); |
10428 if(GTK_IS_TREE_VIEW(thiswindow)) | 10428 if(GTK_IS_TREE_VIEW(thiswindow)) |
10429 { | 10429 { |
10430 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow)); | 10430 thiswindow = (GtkWidget *)gtk_tree_view_get_selection(GTK_TREE_VIEW(thiswindow)); |
10431 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), (gpointer)sigid); | 10431 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc), GINT_TO_POINTER(sigid)); |
10432 } | 10432 } |
10433 else | 10433 else |
10434 { | 10434 { |
10435 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(_combobox_select_event), (gpointer)sigid); | 10435 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(_combobox_select_event), GINT_TO_POINTER(sigid)); |
10436 } | 10436 } |
10437 _set_signal_handler_id(widget, sigid, cid); | 10437 _set_signal_handler_id(widget, sigid, cid); |
10438 | 10438 |
10439 DW_MUTEX_UNLOCK; | 10439 DW_MUTEX_UNLOCK; |
10440 return; | 10440 return; |
10444 thisname = "row-expanded"; | 10444 thisname = "row-expanded"; |
10445 } | 10445 } |
10446 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0) | 10446 else if (GTK_IS_TREE_VIEW(thiswindow) && strcmp(signame, DW_SIGNAL_ITEM_ENTER) == 0) |
10447 { | 10447 { |
10448 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event); | 10448 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, _container_enter_event); |
10449 cid = g_signal_connect(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_container_enter_event), (gpointer)sigid); | 10449 cid = g_signal_connect(G_OBJECT(thiswindow), "key_press_event", G_CALLBACK(_container_enter_event), GINT_TO_POINTER(sigid)); |
10450 _set_signal_handler_id(thiswindow, sigid, cid); | 10450 _set_signal_handler_id(thiswindow, sigid, cid); |
10451 | 10451 |
10452 thisname = "button_press_event"; | 10452 thisname = "button_press_event"; |
10453 thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER); | 10453 thisfunc = _findsigfunc(DW_SIGNAL_ITEM_ENTER); |
10454 } | 10454 } |
10492 DW_MUTEX_UNLOCK; | 10492 DW_MUTEX_UNLOCK; |
10493 return; | 10493 return; |
10494 } | 10494 } |
10495 | 10495 |
10496 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); | 10496 sigid = _set_signal_handler(thiswindow, window, sigfunc, data, thisfunc); |
10497 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc),(gpointer)sigid); | 10497 cid = g_signal_connect(G_OBJECT(thiswindow), thisname, G_CALLBACK(thisfunc),GINT_TO_POINTER(sigid)); |
10498 _set_signal_handler_id(thiswindow, sigid, cid); | 10498 _set_signal_handler_id(thiswindow, sigid, cid); |
10499 DW_MUTEX_UNLOCK; | 10499 DW_MUTEX_UNLOCK; |
10500 } | 10500 } |
10501 | 10501 |
10502 /* | 10502 /* |
10511 void *thisfunc; | 10511 void *thisfunc; |
10512 int _locked_by_me = FALSE; | 10512 int _locked_by_me = FALSE; |
10513 | 10513 |
10514 DW_MUTEX_LOCK; | 10514 DW_MUTEX_LOCK; |
10515 thiswindow = _find_signal_window(window, signame); | 10515 thiswindow = _find_signal_window(window, signame); |
10516 count = (int)g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"); | 10516 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter")); |
10517 thisfunc = _findsigfunc(signame); | 10517 thisfunc = _findsigfunc(signame); |
10518 | 10518 |
10519 for(z=0;z<count;z++) | 10519 for(z=0;z<count;z++) |
10520 { | 10520 { |
10521 SignalHandler sh = _get_signal_handler(thiswindow, (gpointer)z); | 10521 SignalHandler sh = _get_signal_handler(thiswindow, GINT_TO_POINTER(z)); |
10522 | 10522 |
10523 if(sh.intfunc == thisfunc) | 10523 if(sh.intfunc == thisfunc) |
10524 _remove_signal_handler(thiswindow, z); | 10524 _remove_signal_handler(thiswindow, z); |
10525 } | 10525 } |
10526 DW_MUTEX_UNLOCK; | 10526 DW_MUTEX_UNLOCK; |
10537 int z, count; | 10537 int z, count; |
10538 int _locked_by_me = FALSE; | 10538 int _locked_by_me = FALSE; |
10539 | 10539 |
10540 DW_MUTEX_LOCK; | 10540 DW_MUTEX_LOCK; |
10541 thiswindow = _find_signal_window(window, NULL); | 10541 thiswindow = _find_signal_window(window, NULL); |
10542 count = (int)g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"); | 10542 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter")); |
10543 | 10543 |
10544 for(z=0;z<count;z++) | 10544 for(z=0;z<count;z++) |
10545 _remove_signal_handler(thiswindow, z); | 10545 _remove_signal_handler(thiswindow, z); |
10546 g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL); | 10546 g_object_set_data(G_OBJECT(thiswindow), "_dw_sigcounter", NULL); |
10547 DW_MUTEX_UNLOCK; | 10547 DW_MUTEX_UNLOCK; |
10559 int z, count; | 10559 int z, count; |
10560 int _locked_by_me = FALSE; | 10560 int _locked_by_me = FALSE; |
10561 | 10561 |
10562 DW_MUTEX_LOCK; | 10562 DW_MUTEX_LOCK; |
10563 thiswindow = _find_signal_window(window, NULL); | 10563 thiswindow = _find_signal_window(window, NULL); |
10564 count = (int)g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter"); | 10564 count = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(thiswindow), "_dw_sigcounter")); |
10565 | 10565 |
10566 for(z=0;z<count;z++) | 10566 for(z=0;z<count;z++) |
10567 { | 10567 { |
10568 SignalHandler sh = _get_signal_handler(thiswindow, (gpointer)z); | 10568 SignalHandler sh = _get_signal_handler(thiswindow, GINT_TO_POINTER(z)); |
10569 | 10569 |
10570 if(sh.data == data) | 10570 if(sh.data == data) |
10571 _remove_signal_handler(thiswindow, z); | 10571 _remove_signal_handler(thiswindow, z); |
10572 } | 10572 } |
10573 DW_MUTEX_UNLOCK; | 10573 DW_MUTEX_UNLOCK; |