summaryrefslogtreecommitdiffstats
path: root/src/ui/tools
diff options
context:
space:
mode:
authorAlexander Valavanis <valavanisalex@gmail.com>2017-07-05 22:57:09 +0000
committerAlexander Valavanis <valavanisalex@gmail.com>2017-07-05 22:57:09 +0000
commit58f3f347f828b8bfe0fb01ba3194ee5ec3a8c961 (patch)
treec1e4647b685cf05844bd3dffcb324d6a4942f88c /src/ui/tools
parentMerge branch 'ccrb/inkscape-fix-template-preview-crash' (diff)
downloadinkscape-58f3f347f828b8bfe0fb01ba3194ee5ec3a8c961.tar.gz
inkscape-58f3f347f828b8bfe0fb01ba3194ee5ec3a8c961.zip
cursors: rm deprecated gtkstyle custom black/white
Diffstat (limited to 'src/ui/tools')
-rw-r--r--src/ui/tools/dropper-tool.cpp8
-rw-r--r--src/ui/tools/tool-base.cpp4
2 files changed, 5 insertions, 7 deletions
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index 4524d2445..9b37aed17 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -380,15 +380,15 @@ bool DropperTool::root_handler(GdkEvent* event) {
GdkCursor *cursor;
if(apply) {
if(draw_cursor == DRAW_FILL_CURSOR) {
- cursor = sp_cursor_from_xpm(cursor_dropping_f_xpm, NULL, NULL, apply_color);
+ cursor = sp_cursor_from_xpm(cursor_dropping_f_xpm, apply_color);
} else if(draw_cursor == DRAW_STROKE_CURSOR) {
- cursor = sp_cursor_from_xpm(cursor_dropping_s_xpm, NULL, NULL, apply_color);
+ cursor = sp_cursor_from_xpm(cursor_dropping_s_xpm, apply_color);
}
} else {
if(draw_cursor == DRAW_FILL_CURSOR) {
- cursor = sp_cursor_from_xpm(cursor_dropper_f_xpm, NULL, NULL, this->get_color());
+ cursor = sp_cursor_from_xpm(cursor_dropper_f_xpm, this->get_color());
} else if(draw_cursor == DRAW_STROKE_CURSOR) {
- cursor = sp_cursor_from_xpm(cursor_dropper_s_xpm, NULL, NULL, this->get_color());
+ cursor = sp_cursor_from_xpm(cursor_dropper_s_xpm, this->get_color());
}
}
GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(desktop->getCanvas()));
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 457d704aa..59346b491 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -156,8 +156,6 @@ void ToolBase::sp_event_context_set_cursor(GdkCursorType cursor_type) {
void ToolBase::sp_event_context_update_cursor() {
GtkWidget *w = GTK_WIDGET(this->desktop->getCanvas());
if (gtk_widget_get_window (w)) {
- GtkStyle *style = gtk_widget_get_style(w);
-
if (this->cursor_shape) {
if(this->cursor) {
g_object_unref(this->cursor);
@@ -170,7 +168,7 @@ void ToolBase::sp_event_context_update_cursor() {
double strokeOpacity = strokeHasColor ? sp_desktop_get_opacity_tool(this->desktop, this->getPrefsPath(), false) : 0;
this->cursor = sp_cursor_from_xpm(
- this->cursor_shape, &style->black, &style->white,
+ this->cursor_shape,
SP_RGBA32_C_COMPOSE(fillColor, fillOpacity),
SP_RGBA32_C_COMPOSE(strokeColor, strokeOpacity)
);