diff options
| author | monsta <[email protected]> | 2016-02-04 14:07:54 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-02-04 14:08:37 +0300 |
| commit | a58c47065ecb0e58cc06873b8f63fdf231ea23c1 (patch) | |
| tree | c52990bc08a37ec569cf4a977c7e3eb10169e44d /libslab | |
| parent | 73bc9f672f869f4685076ac6cafe76988cadbbf2 (diff) | |
| download | mate-control-center-a58c47065ecb0e58cc06873b8f63fdf231ea23c1.tar.bz2 mate-control-center-a58c47065ecb0e58cc06873b8f63fdf231ea23c1.tar.xz | |
[GTK+3] use x/y align functions of GtkLabel in GTK+ >= 3.16
Diffstat (limited to 'libslab')
| -rw-r--r-- | libslab/app-shell.c | 10 | ||||
| -rw-r--r-- | libslab/application-tile.c | 10 | ||||
| -rw-r--r-- | libslab/directory-tile.c | 10 | ||||
| -rw-r--r-- | libslab/document-tile.c | 15 | ||||
| -rw-r--r-- | libslab/system-tile.c | 5 |
5 files changed, 20 insertions, 30 deletions
diff --git a/libslab/app-shell.c b/libslab/app-shell.c index 3045fff8..9e84e1c5 100644 --- a/libslab/app-shell.c +++ b/libslab/app-shell.c @@ -418,9 +418,8 @@ create_actions_section (AppShellData * app_data, const gchar * title, action = (AppAction *) actions->data; header = gtk_label_new (action->name); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif @@ -718,9 +717,8 @@ create_application_category_sections (AppShellData * app_data) GtkWidget *hbox; GtkWidget *table; -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif diff --git a/libslab/application-tile.c b/libslab/application-tile.c index 88fe066a..7d98da80 100644 --- a/libslab/application-tile.c +++ b/libslab/application-tile.c @@ -402,9 +402,8 @@ create_header (const gchar *name) header = gtk_label_new (name); gtk_label_set_line_wrap (GTK_LABEL (header), TRUE); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif @@ -426,9 +425,8 @@ create_subheader (const gchar *desc) subheader = gtk_label_new (desc); gtk_label_set_ellipsize (GTK_LABEL (subheader), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (subheader, GTK_ALIGN_START); - gtk_widget_set_valign (subheader, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (subheader), 0.0); #else gtk_misc_set_alignment (GTK_MISC (subheader), 0.0, 0.5); #endif diff --git a/libslab/directory-tile.c b/libslab/directory-tile.c index f8a57cfb..ecd5b23a 100644 --- a/libslab/directory-tile.c +++ b/libslab/directory-tile.c @@ -342,9 +342,8 @@ create_header (const gchar *name) header = gtk_label_new (name); gtk_label_set_ellipsize (GTK_LABEL (header), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif @@ -414,9 +413,8 @@ rename_entry_activate_cb (GtkEntry *entry, gpointer user_data) g_object_unref (dst_file); header = gtk_label_new (priv->basename); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif diff --git a/libslab/document-tile.c b/libslab/document-tile.c index f2187b04..89f37478 100644 --- a/libslab/document-tile.c +++ b/libslab/document-tile.c @@ -690,9 +690,8 @@ create_header (const gchar *name) header = gtk_label_new (name); gtk_label_set_ellipsize (GTK_LABEL (header), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif @@ -713,9 +712,8 @@ create_subheader (const gchar *desc) subheader = gtk_label_new (desc); gtk_label_set_ellipsize (GTK_LABEL (subheader), PANGO_ELLIPSIZE_END); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (subheader, GTK_ALIGN_START); - gtk_widget_set_valign (subheader, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (subheader), 0.0); #else gtk_misc_set_alignment (GTK_MISC (subheader), 0.0, 0.5); #endif @@ -810,9 +808,8 @@ rename_entry_activate_cb (GtkEntry *entry, gpointer user_data) } header = gtk_label_new (priv->basename); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif diff --git a/libslab/system-tile.c b/libslab/system-tile.c index c60291c0..d05fc84a 100644 --- a/libslab/system-tile.c +++ b/libslab/system-tile.c @@ -242,9 +242,8 @@ create_header (const gchar *name) header = gtk_label_new (name); gtk_label_set_use_underline (GTK_LABEL (header), TRUE); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (header, GTK_ALIGN_START); - gtk_widget_set_valign (header, GTK_ALIGN_CENTER); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (header), 0.0); #else gtk_misc_set_alignment (GTK_MISC (header), 0.0, 0.5); #endif |