diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-03-27 01:33:44 +0000 |
| commit | 5a4fb2325f60d292b47330f540b26a3279341c90 (patch) | |
| tree | d2aa7967be25450b83e625025366c618101ae49f /src/io/stringstream.h | |
| parent | The Polar Arrange Tab of the Arrange Dialog now hides the parametric (diff) | |
| parent | Remove Snap menu item and improve grid menu item text (diff) | |
| download | inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.tar.gz inkscape-5a4fb2325f60d292b47330f540b26a3279341c90.zip | |
Commit a merge to trunk, with probabal errors
(bzr r11073.1.36)
Diffstat (limited to 'src/io/stringstream.h')
| -rw-r--r-- | src/io/stringstream.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/io/stringstream.h b/src/io/stringstream.h index 4a05d88a9..248e42e50 100644 --- a/src/io/stringstream.h +++ b/src/io/stringstream.h @@ -1,7 +1,7 @@ #ifndef __INKSCAPE_IO_STRINGSTREAM_H__ #define __INKSCAPE_IO_STRINGSTREAM_H__ -#include <glibmm.h> +#include <glibmm/ustring.h> #include "inkscapestream.h" @@ -67,7 +67,7 @@ public: virtual void flush(); - virtual void put(int ch); + virtual int put(gunichar ch); virtual Glib::ustring &getString() { return buffer; } |