Mercurial > dwindows
comparison gtk3/dw.c @ 1917:933b5f7005a9
Fix building on GTK3 versions older than 3.16.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Wed, 28 Sep 2016 22:39:19 +0000 |
parents | eafaab13d0db |
children | 1814a6577a5f |
comparison
equal
deleted
inserted
replaced
1916:eafaab13d0db | 1917:933b5f7005a9 |
---|---|
3799 | 3799 |
3800 DW_MUTEX_LOCK; | 3800 DW_MUTEX_LOCK; |
3801 tmp = gtk_label_new(text); | 3801 tmp = gtk_label_new(text); |
3802 | 3802 |
3803 /* Left and centered */ | 3803 /* Left and centered */ |
3804 #if GTK_CHECK_VERSION(3,16,0) | |
3804 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); | 3805 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); |
3805 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); | 3806 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); |
3807 #else | |
3808 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f); | |
3809 #endif | |
3806 gtk_widget_show(tmp); | 3810 gtk_widget_show(tmp); |
3807 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); | 3811 g_object_set_data(G_OBJECT(tmp), "_dw_id", GINT_TO_POINTER(id)); |
3808 if(_DWDefaultFont) | 3812 if(_DWDefaultFont) |
3809 dw_window_set_font(tmp, _DWDefaultFont); | 3813 dw_window_set_font(tmp, _DWDefaultFont); |
3810 DW_MUTEX_UNLOCK; | 3814 DW_MUTEX_UNLOCK; |
3829 gtk_container_add(GTK_CONTAINER(frame), tmp); | 3833 gtk_container_add(GTK_CONTAINER(frame), tmp); |
3830 gtk_widget_show(tmp); | 3834 gtk_widget_show(tmp); |
3831 gtk_widget_show(frame); | 3835 gtk_widget_show(frame); |
3832 | 3836 |
3833 /* Left and centered */ | 3837 /* Left and centered */ |
3838 #if GTK_CHECK_VERSION(3,16,0) | |
3834 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); | 3839 gtk_label_set_xalign(GTK_LABEL(tmp), 0.0f); |
3835 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); | 3840 gtk_label_set_yalign(GTK_LABEL(tmp), 0.5f); |
3841 #else | |
3842 gtk_misc_set_alignment(GTK_MISC(tmp), 0.0f, 0.5f); | |
3843 #endif | |
3836 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(id)); | 3844 g_object_set_data(G_OBJECT(frame), "_dw_id", GINT_TO_POINTER(id)); |
3837 g_object_set_data(G_OBJECT(frame), "_dw_label", (gpointer)tmp); | 3845 g_object_set_data(G_OBJECT(frame), "_dw_label", (gpointer)tmp); |
3838 if(_DWDefaultFont) | 3846 if(_DWDefaultFont) |
3839 dw_window_set_font(tmp, _DWDefaultFont); | 3847 dw_window_set_font(tmp, _DWDefaultFont); |
3840 DW_MUTEX_UNLOCK; | 3848 DW_MUTEX_UNLOCK; |
9647 y = DW_CENTER; | 9655 y = DW_CENTER; |
9648 if ( style & DW_DT_TOP ) | 9656 if ( style & DW_DT_TOP ) |
9649 y = DW_TOP; | 9657 y = DW_TOP; |
9650 if ( style & DW_DT_BOTTOM ) | 9658 if ( style & DW_DT_BOTTOM ) |
9651 y = DW_BOTTOM; | 9659 y = DW_BOTTOM; |
9660 #if GTK_CHECK_VERSION(3,16,0) | |
9652 gtk_label_set_xalign(GTK_LABEL(handle2), x); | 9661 gtk_label_set_xalign(GTK_LABEL(handle2), x); |
9653 gtk_label_set_yalign(GTK_LABEL(handle2), y); | 9662 gtk_label_set_yalign(GTK_LABEL(handle2), y); |
9663 #else | |
9664 gtk_misc_set_alignment(GTK_MISC(handle2), x, y); | |
9665 #endif | |
9654 if ( style & DW_DT_WORDBREAK ) | 9666 if ( style & DW_DT_WORDBREAK ) |
9655 gtk_label_set_line_wrap( GTK_LABEL(handle), TRUE ); | 9667 gtk_label_set_line_wrap( GTK_LABEL(handle), TRUE ); |
9656 } | 9668 } |
9657 if ( GTK_IS_CHECK_MENU_ITEM(handle2) && (mask & (DW_MIS_CHECKED | DW_MIS_UNCHECKED)) ) | 9669 if ( GTK_IS_CHECK_MENU_ITEM(handle2) && (mask & (DW_MIS_CHECKED | DW_MIS_UNCHECKED)) ) |
9658 { | 9670 { |