diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-06-19 10:00:24 +0000 |
| commit | 06dfaa02d7a80bcdff717d579a48f81643f53f31 (patch) | |
| tree | 49b8e67ad9051f1507b0959cac986383ab4001e2 /src/text-context.cpp | |
| parent | Fix rendering of control points (diff) | |
| parent | fix bug 796451: Measure tools should support rotation constraint (diff) | |
| download | inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.tar.gz inkscape-06dfaa02d7a80bcdff717d579a48f81643f53f31.zip | |
Merge from trunk
(bzr r9508.1.89)
Diffstat (limited to 'src/text-context.cpp')
| -rw-r--r-- | src/text-context.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/text-context.cpp b/src/text-context.cpp index 5af2c5ebc..b709d4d24 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -18,11 +18,10 @@ #endif #include <gdk/gdkkeysyms.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <display/sp-ctrlline.h> #include <display/sodipodi-ctrlrect.h> #include <display/sp-ctrlquadr.h> -#include <gtk/gtkimmulticontext.h> #include <gtkmm/clipboard.h> #include "macros.h" @@ -235,7 +234,7 @@ sp_text_context_setup(SPEventContext *ec) g_signal_connect(G_OBJECT(canvas), "focus_out_event", G_CALLBACK(sptc_focus_out), tc); g_signal_connect(G_OBJECT(tc->imc), "commit", G_CALLBACK(sptc_commit), tc); - if (GTK_WIDGET_HAS_FOCUS(canvas)) { + if (gtk_widget_has_focus(canvas)) { sptc_focus_in(canvas, NULL, tc); } } |