[dasher] Avoid deprecated function



commit 046ec63ca1b101e2ffa55edc91ccfec6afafe8a3
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Tue Apr 6 16:20:39 2021 +0100

    Avoid deprecated function
    
    Use Gtk 3's gtk_font_chooser_?et_font rather than Gtk 2's
    gtk_font_button_?et_font_name

 Src/Gtk2/Preferences.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
index d64897927..bc23ae294 100644
--- a/Src/Gtk2/Preferences.cpp
+++ b/Src/Gtk2/Preferences.cpp
@@ -590,7 +590,7 @@ static void dasher_preferences_dialogue_populate_special_dasher_font(DasherPrefe
 
   GObject *pDasherFontButton = gtk_builder_get_object(pPrivate->pXML, "dasher_fontbutton");
 
-  gtk_font_button_set_font_name(GTK_FONT_BUTTON(pDasherFontButton), 
+  gtk_font_chooser_set_font(GTK_FONT_CHOOSER(pDasherFontButton),
                                 pPrivate->pAppSettings->GetString(SP_DASHER_FONT).c_str());
 }
 
@@ -599,7 +599,7 @@ static void dasher_preferences_dialogue_populate_special_edit_font(DasherPrefere
 
   GObject *pEditFontButton = gtk_builder_get_object(pPrivate->pXML, "edit_fontbutton");
 
-  gtk_font_button_set_font_name(GTK_FONT_BUTTON(pEditFontButton), 
+  gtk_font_chooser_set_font(GTK_FONT_CHOOSER(pEditFontButton),
                                 pPrivate->pAppSettings->GetString(APP_SP_EDIT_FONT).c_str());
 }
  
@@ -784,14 +784,14 @@ extern "C" void on_dasher_font_changed(GtkFontButton *pButton, gpointer pUserDat
   DasherMainPrivate *pMainPrivate = DASHER_MAIN_GET_PRIVATE(pUserData);
   pMainPrivate->pAppSettings->SetString(
                                  SP_DASHER_FONT, 
-                                 gtk_font_button_get_font_name(pButton));
+                                 gtk_font_chooser_get_font(GTK_FONT_CHOOSER(pButton)));
 }
 
 extern "C" void on_edit_font_changed(GtkFontButton *pButton, gpointer pUserData) {
   DasherMainPrivate *pMainPrivate = DASHER_MAIN_GET_PRIVATE(pUserData);
   pMainPrivate->pAppSettings->SetString(
                                  APP_SP_EDIT_FONT, 
-                                 gtk_font_button_get_font_name(pButton));
+                                 gtk_font_chooser_get_font(GTK_FONT_CHOOSER(pButton)));
 }
 
 extern "C" void set_dasher_fontsize(GtkWidget *pWidget, gboolean pUserData) {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]