Mercurial > geeqie.yaz

comparison src/image.c @ 1358:db324ac52bcc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Indentation fixes.
author zas_
date Sun, 01 Mar 2009 16:43:48 +0000
parents 4ca837d74999
children 8f3d44564146
comparison
equal deleted inserted replaced
1357:4ca837d74999 1358:db324ac52bcc
1631 1631
1632 if (frame) 1632 if (frame)
1633 { 1633 {
1634 imd->frame = gtk_frame_new(NULL); 1634 imd->frame = gtk_frame_new(NULL);
1635 #if GTK_CHECK_VERSION(2,12,0) 1635 #if GTK_CHECK_VERSION(2,12,0)
1636 g_object_ref(imd->pr); 1636 g_object_ref(imd->pr);
1637 #else 1637 #else
1638 gtk_widget_ref(imd->pr); 1638 gtk_widget_ref(imd->pr);
1639 #endif 1639 #endif
1640 if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr); 1640 if (imd->has_frame != -1) gtk_container_remove(GTK_CONTAINER(imd->widget), imd->pr);
1641 gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr); 1641 gtk_container_add(GTK_CONTAINER(imd->frame), imd->pr);
1642 1642
1643 #if GTK_CHECK_VERSION(2,12,0) 1643 #if GTK_CHECK_VERSION(2,12,0)
1644 g_object_unref(imd->pr); 1644 g_object_unref(imd->pr);
1645 #else 1645 #else
1646 gtk_widget_unref(imd->pr); 1646 gtk_widget_unref(imd->pr);
1647 #endif 1647 #endif
1648 g_signal_connect(G_OBJECT(imd->frame), "expose_event", 1648 g_signal_connect(G_OBJECT(imd->frame), "expose_event",
1649 G_CALLBACK(selectable_frame_expose_cb), NULL); 1649 G_CALLBACK(selectable_frame_expose_cb), NULL);
1650 1650
1651 GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS); 1651 GTK_WIDGET_SET_FLAGS(imd->frame, GTK_CAN_FOCUS);
1656 1656
1657 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event", 1657 g_signal_connect_after(G_OBJECT(imd->frame), "expose_event",
1658 G_CALLBACK(image_focus_expose), imd); 1658 G_CALLBACK(image_focus_expose), imd);
1659 1659
1660 #if GTK_CHECK_VERSION(2,14,0) 1660 #if GTK_CHECK_VERSION(2,14,0)
1661 gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0); 1661 gtk_box_pack_start(GTK_BOX(imd->widget), imd->frame, TRUE, TRUE, 0);
1662 #else 1662 #else
1663 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame); 1663 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->frame);
1664 #endif 1664 #endif
1665 gtk_widget_show(imd->frame); 1665 gtk_widget_show(imd->frame);
1666 } 1666 }
1667 else 1667 else
1668 { 1668 {
1669 #if GTK_CHECK_VERSION(2,12,0) 1669 #if GTK_CHECK_VERSION(2,12,0)
1670 g_object_ref(imd->pr); 1670 g_object_ref(imd->pr);
1676 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr); 1676 gtk_container_remove(GTK_CONTAINER(imd->frame), imd->pr);
1677 gtk_widget_destroy(imd->frame); 1677 gtk_widget_destroy(imd->frame);
1678 imd->frame = NULL; 1678 imd->frame = NULL;
1679 } 1679 }
1680 #if GTK_CHECK_VERSION(2,14,0) 1680 #if GTK_CHECK_VERSION(2,14,0)
1681 gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0); 1681 gtk_box_pack_start(GTK_BOX(imd->widget), imd->pr, TRUE, TRUE, 0);
1682 #else 1682 #else
1683 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr); 1683 gtk_box_pack_start_defaults(GTK_BOX(imd->widget), imd->pr);
1684 #endif 1684 #endif
1685 1685
1686 #if GTK_CHECK_VERSION(2,12,0) 1686 #if GTK_CHECK_VERSION(2,12,0)
1687 g_object_unref(imd->pr); 1687 g_object_unref(imd->pr);
1688 #else 1688 #else
1689 gtk_widget_unref(imd->pr); 1689 gtk_widget_unref(imd->pr);
1690 #endif 1690 #endif
1691 } 1691 }
1692 1692
1693 gtk_widget_show(imd->pr); 1693 gtk_widget_show(imd->pr);
1694 1694