[gtk+] GtkFontChooser: initialization and destruction of deprecated widgets and data models
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontChooser: initialization and destruction of deprecated widgets and data models
- Date: Mon, 15 Aug 2011 23:49:54 +0000 (UTC)
commit e08006f69119be887109dc5d5ca641091d698afb
Author: Alberto Ruiz <aruiz gnome org>
Date: Wed Apr 27 01:08:55 2011 +0100
GtkFontChooser: initialization and destruction of deprecated widgets and data models
gtk/gtkfontchooser.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 60 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index e0f3572..2c1dc11 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -930,6 +930,59 @@ gtk_font_selection_ref_face (GtkFontSelection *fontsel,
priv->face = face;
}
+/* These functions populate the deprecated widgets to maintain API compatibility */
+static void
+populate_font_model (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+}
+
+static void
+update_font_model_selection (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+}
+
+static void
+update_face_model (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+}
+
+static void
+update_size_model (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+}
+
+static void
+initialize_deprecated_widgets (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+
+ priv->_size_model = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
+ priv->_font_model = gtk_list_store_new (2, PANGO_TYPE_FONT_FAMILY, G_TYPE_STRING);
+ priv->_face_model = gtk_list_store_new (2, PANGO_TYPE_FONT_FACE, G_TYPE_STRING);
+
+ priv->size_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->_size_model));
+ priv->font_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->_font_model));
+ priv->face_list = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->_size_model));
+
+ g_object_unref (priv->_size_model);
+ g_object_unref (priv->_font_model);
+ g_object_unref (priv->_face_model);
+}
+
+static void
+destroy_deprecated_widgets (GtkFontSelection *fontsel)
+{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
+
+ g_object_unref (priv->size_list);
+ g_object_unref (priv->font_list);
+ g_object_unref (priv->face_list);
+}
+
/*****************************************************************************
* These functions are the main public interface for getting/setting the font.
*****************************************************************************/
@@ -948,6 +1001,7 @@ gtk_font_selection_ref_face (GtkFontSelection *fontsel,
GtkWidget *
gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
return NULL;
@@ -967,6 +1021,7 @@ gtk_font_selection_get_family_list (GtkFontSelection *fontsel)
GtkWidget *
gtk_font_selection_get_face_list (GtkFontSelection *fontsel)
{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
return NULL;
@@ -986,9 +1041,10 @@ gtk_font_selection_get_face_list (GtkFontSelection *fontsel)
GtkWidget *
gtk_font_selection_get_size_entry (GtkFontSelection *fontsel)
{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
- return NULL;
+ return priv->size_spin;
}
/**
@@ -1004,6 +1060,7 @@ gtk_font_selection_get_size_entry (GtkFontSelection *fontsel)
GtkWidget *
gtk_font_selection_get_size_list (GtkFontSelection *fontsel)
{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
return NULL;
@@ -1022,9 +1079,10 @@ gtk_font_selection_get_size_list (GtkFontSelection *fontsel)
GtkWidget *
gtk_font_selection_get_preview_entry (GtkFontSelection *fontsel)
{
+ GtkFontSelectionPrivate *priv = fontsel->priv;
g_return_val_if_fail (GTK_IS_FONT_SELECTION (fontsel), NULL);
- return NULL;
+ return priv->preview;
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]