diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-07-06 01:59:32 +0000 |
| commit | e65a02ed32b78534739aba24929ece7c44dd967f (patch) | |
| tree | 13cf022f18f6b5bae46aad4bc339e512f069a514 /src/desktop.cpp | |
| parent | Pull 2Geom revision 2013 (extra constructors for Rect). (diff) | |
| parent | Text edit dialog: Apply button should grab default only after adding to window (diff) | |
| download | inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.tar.gz inkscape-e65a02ed32b78534739aba24929ece7c44dd967f.zip | |
Merge from trunk
(bzr r10347.1.5)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index 181a19e1b..4ff2716ca 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -649,7 +649,7 @@ SPDesktop::change_document (SPDocument *theDocument) * Make desktop switch event contexts. */ void -SPDesktop::set_event_context (GtkType type, const gchar *config) +SPDesktop::set_event_context (GType type, const gchar *config) { SPEventContext *ec; while (event_context) { @@ -680,7 +680,7 @@ SPDesktop::set_event_context (GtkType type, const gchar *config) * Push event context onto desktop's context stack. */ void -SPDesktop::push_event_context (GtkType type, const gchar *config, unsigned int key) +SPDesktop::push_event_context (GType type, const gchar *config, unsigned int key) { SPEventContext *ref, *ec; |