summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-03-19 02:26:40 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-03-19 02:26:40 +0000
commit5c8a7b8df6203791610487d2435646f86a0eed96 (patch)
tree3bf6c7a52f27978f84b267482bb69389051c4085 /src/libnrtype
parentchanges_2013_03_18c.patch (diff)
parentDrop remaining unused functions (diff)
downloadinkscape-5c8a7b8df6203791610487d2435646f86a0eed96.tar.gz
inkscape-5c8a7b8df6203791610487d2435646f86a0eed96.zip
merge from trunk (r12224)
(bzr r11668.1.60)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/font-lister.cpp21
-rw-r--r--src/libnrtype/font-lister.h10
2 files changed, 24 insertions, 7 deletions
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 90900baba..5b495d14d 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -969,6 +969,17 @@ namespace Inkscape
}
// Helper functions
+
+// Separator function (if true, a separator will be drawn)
+gboolean font_lister_separator_func(GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer /*data*/)
+{
+ gchar* text = 0;
+ gtk_tree_model_get(model, iter, 0, &text, -1 ); // Column 0: FontList.family
+ return (text && strcmp(text,"#") == 0);
+}
+
void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/,
GtkCellRenderer *cell,
GtkTreeModel *model,
@@ -1042,3 +1053,13 @@ void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/,
g_object_set (G_OBJECT (cell), "markup", markup.c_str(), NULL);
}
+/*
+ Local Variables:
+ mode:c++
+ c-file-style:"stroustrup"
+ c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+ indent-tabs-mode:nil
+ fill-column:99
+ End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index 5c48bf7a8..5a8f578d9 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -296,13 +296,9 @@ namespace Inkscape
}
// Helper functions
-// Separator function (if true, a separator will be drawn)
-static gboolean font_lister_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer /*data*/)
-{
- gchar* text = 0;
- gtk_tree_model_get(model, iter, 0, &text, -1 ); // Column 0: FontList.family
- return (text && strcmp(text,"#") == 0);
-}
+gboolean font_lister_separator_func(GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer /*data*/);
void font_lister_cell_data_func(GtkCellLayout */*cell_layout*/,
GtkCellRenderer *cell,