summaryrefslogtreecommitdiffstats
path: root/src/widgets/font-selector.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-07-24 16:49:11 +0000
committerjabiertxof <info@marker.es>2016-07-24 16:49:11 +0000
commita5d6c9a27683820be3d84eea73c2d6f161ce0e8e (patch)
treeb9ba6c20747c4d6d7b4479d229b9daf8eea5c5bd /src/widgets/font-selector.cpp
parentThis for you CR ยท Measure line, show the distance on rect lines CAD like wit... (diff)
downloadinkscape-a5d6c9a27683820be3d84eea73c2d6f161ce0e8e.tar.gz
inkscape-a5d6c9a27683820be3d84eea73c2d6f161ce0e8e.zip
Add Text tag and update widgets code
(bzr r15017.1.2)
Diffstat (limited to 'src/widgets/font-selector.cpp')
-rw-r--r--src/widgets/font-selector.cpp26
1 files changed, 1 insertions, 25 deletions
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index aefcb2e81..eeb80ab28 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -19,9 +19,6 @@
# include "config.h"
#endif
-#include <libnrtype/font-lister.h>
-#include <libnrtype/font-instance.h>
-
#include <2geom/transforms.h>
#include <gtk/gtk.h>
@@ -34,29 +31,7 @@
/* SPFontSelector */
-struct SPFontSelector
-{
-#if GTK_CHECK_VERSION(3,0,0)
- GtkBox hbox;
-#else
- GtkHBox hbox;
-#endif
- unsigned int block_emit : 1;
-
- GtkWidget *family;
- GtkWidget *style;
- GtkWidget *size;
-
- GtkWidget *family_treeview;
- GtkWidget *style_treeview;
-
- NRNameList families;
- NRStyleList styles;
- gfloat fontsize;
- bool fontsize_dirty;
- Glib::ustring *fontspec;
-};
struct SPFontSelectorClass
@@ -274,6 +249,7 @@ static void sp_font_selector_dispose(GObject *object)
if (fsel->fontspec) {
delete fsel->fontspec;
+ fsel->fontspec = 0;
}
if (fsel->families.length > 0) {