diff options
| author | Andrew Higginson <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
|---|---|---|
| committer | Andrew <at.higginson@gmail.com> | 2011-12-27 21:04:47 +0000 |
| commit | 80960b623a99aae1402ab651b2974ef544ed3b03 (patch) | |
| tree | ba49d42c2789e9e11f805e2d5263e10f9fedeef8 /src/inkview.cpp | |
| parent | try to fix bug (diff) | |
| parent | GDL: Cherry-pick upstream patch 73852 (2011-03-23) - Add missing return value. (diff) | |
| download | inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.tar.gz inkscape-80960b623a99aae1402ab651b2974ef544ed3b03.zip | |
merged with trunk so I can build again...
(bzr r10092.1.36)
Diffstat (limited to 'src/inkview.cpp')
| -rw-r--r-- | src/inkview.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/inkview.cpp b/src/inkview.cpp index 448aa77f1..1fd5c2d56 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -38,18 +38,13 @@ #include <sys/stat.h> #include <locale.h> -#include <glib/gmem.h> -#include <libnr/nr-macros.h> +#include <glib.h> // #include <stropts.h> #include <libxml/tree.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtktable.h> -#include <gtk/gtkbutton.h> +#include <gtk/gtk.h> #include <gtkmm/main.h> @@ -316,7 +311,6 @@ main (int argc, const char **argv) gtk_window_set_default_size (GTK_WINDOW (w), MIN ((int)(ss.doc)->getWidth (), (int)gdk_screen_width () - 64), MIN ((int)(ss.doc)->getHeight (), (int)gdk_screen_height () - 64)); - gtk_window_set_policy (GTK_WINDOW (w), TRUE, TRUE, FALSE); ss.window = w; g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss); |