[dia] [gtk-deprectaed] Only include Gtk/Gdk main headers

[Hans Breuer <hans src gnome org>]

commit 6af1c004f239536f3cdadaea890c74e36590ac4b
Author: Hans Breuer <hans breuer org>
Date:   Mon Jul 30 19:21:51 2012 +0200

    [gtk-deprectaed] Only include Gtk/Gdk main headers
    
    exception: <gdk/gdkkeysyms.h>

 app/display.h                         |    1 -
 app/exit_dialog.h                     |    3 +--
 lib/dia_image.h                       |    2 +-
 lib/diacellrendererproperty.h         |    2 +-
 lib/dialogs.h                         |    3 +--
 lib/prop_text.c                       |    1 +
 lib/widgets.h                         |    2 +-
 plug-ins/cairo/diacairo-interactive.c |    2 +-
 plug-ins/cairo/diacairo-print.h       |    4 +---
 9 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/app/display.h b/app/display.h
index cdc8e4e..c7a935b 100644
--- a/app/display.h
+++ b/app/display.h
@@ -19,7 +19,6 @@
 #define DDISPLAY_H
 
 #include <gtk/gtk.h>
-#include <gtk/gtkimcontext.h>
 
 typedef struct _DDisplay DDisplay;
 
diff --git a/app/exit_dialog.h b/app/exit_dialog.h
index f6e6500..30d7df9 100644
--- a/app/exit_dialog.h
+++ b/app/exit_dialog.h
@@ -22,8 +22,7 @@
 #ifndef EXIT_DIALOG_H
 #define EXIT_DIALOG_H
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/lib/dia_image.h b/lib/dia_image.h
index ebc33ec..450410b 100644
--- a/lib/dia_image.h
+++ b/lib/dia_image.h
@@ -19,7 +19,7 @@
 #define DIA_IMAGE_H
 
 #include "diatypes.h"
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include "geometry.h"
diff --git a/lib/diacellrendererproperty.h b/lib/diacellrendererproperty.h
index dca306c..9cd42b5 100644
--- a/lib/diacellrendererproperty.h
+++ b/lib/diacellrendererproperty.h
@@ -26,7 +26,7 @@
 #define __DIA_CELL_RENDERER_PROPERTY_H__
 
 
-#include <gtk/gtkcellrenderer.h>
+#include <gtk/gtk.h>
 #include "diatypes.h"
 
 #define DIA_TYPE_CELL_RENDERER_PROPERTY            (dia_cell_renderer_property_get_type ())
diff --git a/lib/dialogs.h b/lib/dialogs.h
index 75cbba0..3486d71 100644
--- a/lib/dialogs.h
+++ b/lib/dialogs.h
@@ -18,8 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 
 GtkWidget *
 dialog_make(char *title, char *okay_text, char *cancel_text,
diff --git a/lib/prop_text.c b/lib/prop_text.c
index dbc8634..e8d3221 100644
--- a/lib/prop_text.c
+++ b/lib/prop_text.c
@@ -28,6 +28,7 @@
 #endif
 
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include "widgets.h"
 #include "properties.h"
diff --git a/lib/widgets.h b/lib/widgets.h
index 68f9fec..d35cb08 100644
--- a/lib/widgets.h
+++ b/lib/widgets.h
@@ -19,7 +19,7 @@
 #define WIDGETS_H
 
 #include <gdk/gdk.h>
-#include <gtk/gtkspinbutton.h>
+#include <gtk/gtk.h>
 
 #include "diatypes.h"
 #include "font.h"
diff --git a/plug-ins/cairo/diacairo-interactive.c b/plug-ins/cairo/diacairo-interactive.c
index 132fd61..fad917b 100644
--- a/plug-ins/cairo/diacairo-interactive.c
+++ b/plug-ins/cairo/diacairo-interactive.c
@@ -23,7 +23,7 @@
 #include "diacairo.h"
 
 #include <gdk/gdk.h>
-#include <gtk/gtkversion.h>
+#include <gtk/gtk.h> /* GTK_CHECK_VERSION */
 
 #include "intl.h"
 #include "color.h"
diff --git a/plug-ins/cairo/diacairo-print.h b/plug-ins/cairo/diacairo-print.h
index 526e9bf..9725e51 100644
--- a/plug-ins/cairo/diacairo-print.h
+++ b/plug-ins/cairo/diacairo-print.h
@@ -1,7 +1,5 @@
 
-#include <gtk/gtkversion.h>
-
-#include <gtk/gtkprintoperation.h>
+#include <gtk/gtk.h>
 #include "diagramdata.h"
 
 GtkPrintOperation *