Mercurial > audlegacy-plugins
comparison src/skins/ui_dock.c @ 3017:963796db51ea
Don't use deprecated gtk macros and types
author | Tomasz Mon <desowin@gmail.com> |
---|---|
date | Thu, 09 Apr 2009 14:23:42 +0200 |
parents | 3134a0987162 |
children | f7613eafe9f0 |
comparison
equal
deleted
inserted
replaced
3016:767f4f0a6fd6 | 3017:963796db51ea |
---|---|
426 return; | 426 return; |
427 | 427 |
428 gtk_window_present(w); | 428 gtk_window_present(w); |
429 mx = event->x; | 429 mx = event->x; |
430 my = event->y; | 430 my = event->y; |
431 gtk_object_set_data(GTK_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx)); | 431 g_object_set_data(G_OBJECT(w), "move_offset_x", GINT_TO_POINTER(mx)); |
432 gtk_object_set_data(GTK_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my)); | 432 g_object_set_data(G_OBJECT(w), "move_offset_y", GINT_TO_POINTER(my)); |
433 if (move_list) | 433 if (move_list) |
434 gtk_object_set_data(GTK_OBJECT(w), "docked_list", | 434 g_object_set_data(G_OBJECT(w), "docked_list", |
435 get_docked_list(NULL, window_list, w, 0, 0)); | 435 get_docked_list(NULL, window_list, w, 0, 0)); |
436 else { | 436 else { |
437 dwin = g_new0(DockedWindow, 1); | 437 dwin = g_new0(DockedWindow, 1); |
438 dwin->w = w; | 438 dwin->w = w; |
439 gtk_object_set_data(GTK_OBJECT(w), "docked_list", | 439 g_object_set_data(G_OBJECT(w), "docked_list", |
440 g_list_append(NULL, dwin)); | 440 g_list_append(NULL, dwin)); |
441 } | 441 } |
442 gtk_object_set_data(GTK_OBJECT(w), "window_list", window_list); | 442 g_object_set_data(G_OBJECT(w), "window_list", window_list); |
443 gtk_object_set_data(GTK_OBJECT(w), "is_moving", GINT_TO_POINTER(1)); | 443 g_object_set_data(G_OBJECT(w), "is_moving", GINT_TO_POINTER(1)); |
444 } | 444 } |
445 | 445 |
446 void | 446 void |
447 dock_move_motion(GtkWindow * w, GdkEventMotion * event) | 447 dock_move_motion(GtkWindow * w, GdkEventMotion * event) |
448 { | 448 { |
449 gint offset_x, offset_y, x, y; | 449 gint offset_x, offset_y, x, y; |
450 GList *dlist; | 450 GList *dlist; |
451 GList *window_list; | 451 GList *window_list; |
452 | 452 |
453 if (!gtk_object_get_data(GTK_OBJECT(w), "is_moving")) | 453 if (!g_object_get_data(G_OBJECT(w), "is_moving")) |
454 return; | 454 return; |
455 | 455 |
456 offset_x = | 456 offset_x = |
457 GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), "move_offset_x")); | 457 GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_x")); |
458 offset_y = | 458 offset_y = |
459 GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(w), "move_offset_y")); | 459 GPOINTER_TO_INT(g_object_get_data(G_OBJECT(w), "move_offset_y")); |
460 dlist = gtk_object_get_data(GTK_OBJECT(w), "docked_list"); | 460 dlist = g_object_get_data(G_OBJECT(w), "docked_list"); |
461 window_list = gtk_object_get_data(GTK_OBJECT(w), "window_list"); | 461 window_list = g_object_get_data(G_OBJECT(w), "window_list"); |
462 | 462 |
463 x = event->x_root - offset_x; | 463 x = event->x_root - offset_x; |
464 y = event->y_root - offset_y; | 464 y = event->y_root - offset_y; |
465 | 465 |
466 calc_snap_offset(dlist, window_list, x, y, &offset_x, &offset_y); | 466 calc_snap_offset(dlist, window_list, x, y, &offset_x, &offset_y); |
472 | 472 |
473 void | 473 void |
474 dock_move_release(GtkWindow * w) | 474 dock_move_release(GtkWindow * w) |
475 { | 475 { |
476 GList *dlist; | 476 GList *dlist; |
477 gtk_object_remove_data(GTK_OBJECT(w), "is_moving"); | 477 g_object_set_data(G_OBJECT(w), "is_moving", NULL); |
478 gtk_object_remove_data(GTK_OBJECT(w), "move_offset_x"); | 478 g_object_set_data(G_OBJECT(w), "move_offset_x", NULL); |
479 gtk_object_remove_data(GTK_OBJECT(w), "move_offset_y"); | 479 g_object_set_data(G_OBJECT(w), "move_offset_y", NULL); |
480 if ((dlist = gtk_object_get_data(GTK_OBJECT(w), "docked_list")) != NULL) | 480 if ((dlist = g_object_get_data(G_OBJECT(w), "docked_list")) != NULL) |
481 free_docked_list(dlist); | 481 free_docked_list(dlist); |
482 gtk_object_remove_data(GTK_OBJECT(w), "docked_list"); | 482 g_object_set_data(G_OBJECT(w), "docked_list", NULL); |
483 gtk_object_remove_data(GTK_OBJECT(w), "window_list"); | 483 g_object_set_data(G_OBJECT(w), "window_list", NULL); |
484 } | 484 } |
485 | 485 |
486 gboolean | 486 gboolean |
487 dock_is_moving(GtkWindow * w) | 487 dock_is_moving(GtkWindow * w) |
488 { | 488 { |
489 if (gtk_object_get_data(GTK_OBJECT(w), "is_moving")) | 489 if (g_object_get_data(G_OBJECT(w), "is_moving")) |
490 return TRUE; | 490 return TRUE; |
491 return FALSE; | 491 return FALSE; |
492 } | 492 } |
493 | 493 |
494 GList * | 494 GList * |