diff options
| author | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
| commit | aeb9c1bde66de096910757abb17dedb94ad74207 (patch) | |
| tree | c0adf97685b0fa8af1553b14d20601f280492762 /src/document-undo.h | |
| parent | Fixed some math, so that the objects now line up correctly (diff) | |
| parent | Adding checks to prevent null pointer dereferences (diff) | |
| download | inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.tar.gz inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.zip | |
Trunk merge
(bzr r11073.1.29)
Diffstat (limited to 'src/document-undo.h')
| -rw-r--r-- | src/document-undo.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/document-undo.h b/src/document-undo.h index 7ff45c269..087e12b5a 100644 --- a/src/document-undo.h +++ b/src/document-undo.h @@ -1,7 +1,7 @@ #ifndef SEEN_SP_DOCUMENT_UNDO_H #define SEEN_SP_DOCUMENT_UNDO_H -typedef struct _GtkObject GtkObject; +typedef struct _GObject GObject; class SPDesktop; @@ -37,7 +37,7 @@ public: static void maybeDone(SPDocument *document, const gchar *keyconst, unsigned int event_type, Glib::ustring const &event_description); - static void resetKey(Inkscape::Application *inkscape, SPDesktop *desktop, GtkObject *base); + static void resetKey(Inkscape::Application *inkscape, SPDesktop *desktop, GObject *base); static void cancel(SPDocument *document); |