diff options
| author | Martin Owens <doctormo@gmail.com> | 2016-04-12 09:47:23 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2016-04-12 09:47:23 +0000 |
| commit | 4f88ccdfed31eb06cfc0d362dc2cb8358bb65e34 (patch) | |
| tree | b80b02b3df907d7d2332439d08d39cb597ab1e94 /src/widgets | |
| parent | Bump version to gtk 3.8 of later (diff) | |
| download | inkscape-4f88ccdfed31eb06cfc0d362dc2cb8358bb65e34.tar.gz inkscape-4f88ccdfed31eb06cfc0d362dc2cb8358bb65e34.zip | |
Bump ifdefs to 3.8 (now ifdefs say 3.0 instead of 3.2 or 3.8)
(bzr r14788)
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/ruler.cpp | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index 19dbb04ab..de14caa12 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -239,7 +239,7 @@ static gboolean eek_preview_draw(GtkWidget *widget, cairo_t *cr) { - GtkStyle *style = gtk_widget_get_style(widget); + EekPreview *preview = EEK_PREVIEW(widget); EekPreviewPrivate *priv = EEK_PREVIEW_GET_PRIVATE(preview); @@ -284,7 +284,8 @@ gboolean eek_preview_draw(GtkWidget *widget, 0, 0, allocation.width, allocation.height); #else - GdkWindow* window = gtk_widget_get_window(widget); + GtkStyle *style = gtk_widget_get_style(widget); + GdkWindow *window = gtk_widget_get_window(widget); gtk_paint_flat_box( style, window, diff --git a/src/widgets/ruler.cpp b/src/widgets/ruler.cpp index 3a5e76277..0b473f173 100644 --- a/src/widgets/ruler.cpp +++ b/src/widgets/ruler.cpp @@ -284,17 +284,10 @@ sp_ruler_init (SPRuler *ruler) priv->font_scale = DEFAULT_RULER_FONT_SCALE; #if GTK_CHECK_VERSION(3,0,0) - #if GTK_CHECK_VERSION(3,8,0) const gchar *str = "SPRuler {\n" " background-color: @theme_bg_color;\n" "}\n"; - #else - const gchar *str = - "SPRuler {\n" - " background-color: @bg_color;\n" - "}\n"; - #endif GtkCssProvider *css = gtk_css_provider_new (); gtk_css_provider_load_from_data (css, str, -1, NULL); gtk_style_context_add_provider (gtk_widget_get_style_context (GTK_WIDGET (ruler)), |