diff options
| author | Wolfgang Ulbrich <[email protected]> | 2016-01-27 18:14:37 +0100 |
|---|---|---|
| committer | Wolfgang Ulbrich <[email protected]> | 2016-01-27 18:14:37 +0100 |
| commit | 37e590249dd9d191a2331040fb879830c9ceea8e (patch) | |
| tree | 59fa7570d63841063eeb7682c201a5053f3d427b /mateweather/mateweather-pref.c | |
| parent | acc20eb50af01fcb6ca2a024b65913cc32a1e670 (diff) | |
| download | mate-applets-37e590249dd9d191a2331040fb879830c9ceea8e.tar.bz2 mate-applets-37e590249dd9d191a2331040fb879830c9ceea8e.tar.xz | |
GTK3: fix previous GtkMisc deprecations fix commit
Diffstat (limited to 'mateweather/mateweather-pref.c')
| -rw-r--r-- | mateweather/mateweather-pref.c | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/mateweather/mateweather-pref.c b/mateweather/mateweather-pref.c index 6d64a59d..79448acd 100644 --- a/mateweather/mateweather-pref.c +++ b/mateweather/mateweather-pref.c @@ -575,8 +575,8 @@ static GtkWidget* create_hig_catagory(GtkWidget* main_box, gchar* title) tmp = g_strdup_printf ("<b>%s</b>", title); label = gtk_label_new (NULL); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); #endif @@ -871,10 +871,10 @@ static void mateweather_pref_create(MateWeatherPref* pref) temp_label = gtk_label_new_with_mnemonic (_("_Temperature unit:")); gtk_label_set_use_markup (GTK_LABEL (temp_label), TRUE); gtk_label_set_justify (GTK_LABEL (temp_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (temp_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (temp_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (temp_label), 0.0, 0.5); #endif gtk_widget_show (temp_label); @@ -897,10 +897,10 @@ static void mateweather_pref_create(MateWeatherPref* pref) speed_label = gtk_label_new_with_mnemonic (_("_Wind speed unit:")); gtk_label_set_use_markup (GTK_LABEL (speed_label), TRUE); gtk_label_set_justify (GTK_LABEL (speed_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (speed_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (speed_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (speed_label), 0.0, 0.5); #endif gtk_widget_show (speed_label); @@ -928,10 +928,10 @@ static void mateweather_pref_create(MateWeatherPref* pref) pres_label = gtk_label_new_with_mnemonic (_("_Pressure unit:")); gtk_label_set_use_markup (GTK_LABEL (pres_label), TRUE); gtk_label_set_justify (GTK_LABEL (pres_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (pres_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else - gtk_misc_set_alignment (GTK_MISC (pres_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (pres_label), 0.0, 0.5); #endif gtk_widget_show (pres_label); @@ -962,8 +962,8 @@ static void mateweather_pref_create(MateWeatherPref* pref) dist_label = gtk_label_new_with_mnemonic (_("_Visibility unit:")); gtk_label_set_use_markup (GTK_LABEL (dist_label), TRUE); gtk_label_set_justify (GTK_LABEL (dist_label), GTK_JUSTIFY_LEFT); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (dist_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (dist_label), 0, 0.5); #endif @@ -1070,12 +1070,6 @@ static void mateweather_pref_create(MateWeatherPref* pref) pref_basic_update_lbl = gtk_label_new_with_mnemonic (_("_Automatically update every:")); gtk_widget_show (pref_basic_update_lbl); - -/* - gtk_label_set_justify (GTK_LABEL (pref_basic_update_lbl), GTK_JUSTIFY_RIGHT); - gtk_misc_set_alignment (GTK_MISC (pref_basic_update_lbl), 1, 0.5); -*/ - gtk_widget_show (pref_basic_update_hbox); pref_basic_update_spin_adj = gtk_adjustment_new (30, 1, 3600, 5, 25, 1); @@ -1135,8 +1129,8 @@ static void mateweather_pref_create(MateWeatherPref* pref) gtk_container_add (GTK_CONTAINER (pref_notebook), pref_loc_hbox); tree_label = gtk_label_new_with_mnemonic (_("_Select a location:")); -#if GTK_CHECK_VERSION (3, 0, 0) - gtk_widget_set_halign (tree_label, GTK_ALIGN_START); +#if GTK_CHECK_VERSION (3, 16, 0) + gtk_label_set_xalign (GTK_LABEL (tree_label), 0.0); #else gtk_misc_set_alignment (GTK_MISC (tree_label), 0.0, 0.5); #endif |