gtk/gtk.h move the remaining deprecated widgets to the separate sections

2008-03-06  Michael Natterer  <mitch@imendio.com>

	* gtk/gtk.h
	* gtk/Makefile.am: move the remaining deprecated widgets to the
	separate sections and replaced spaces by tabs in Makefile.am

svn path=/trunk/; revision=19719

diff --git a/ChangeLog b/ChangeLog
index aa266498e2c68a5074fe8a4d8d92b86b7aaaa999..8520f73c6ed78e9fb7488154ad2fe1c42440b903 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-06  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtk.h
+       * gtk/Makefile.am: move the remaining deprecated widgets to the
+       separate sections and replaced spaces by tabs in Makefile.am
+
 2008-03-05  Johan Dahlin  <johan@gnome.org>
 
        * configure.in: Add --disable-cups option.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b46d379b8accbe61e8499fd34a07b691276125c0..9c11680dd4b6ab4bc3e062fb0b11b98deae86e36 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -216,7 +216,6 @@ gtk_public_h_sources =          \
        gtkinputdialog.h        \
        gtkinvisible.h          \
        gtkitem.h               \
-       gtkitemfactory.h        \
        gtklabel.h              \
        gtklayout.h             \
        gtklinkbutton.h         \
@@ -235,15 +234,12 @@ gtk_public_h_sources =          \
        gtkpagesetup.h          \
        gtkpaned.h              \
        gtkpapersize.h          \
-       gtkpixmap.h             \
        gtkplug.h               \
-       gtkpreview.h            \
        gtkprintcontext.h       \
        gtkprintoperation.h     \
        gtkprintoperationpreview.h      \
        gtkprintsettings.h      \
        gtkprivate.h            \
-       gtkprogress.h           \
        gtkprogressbar.h        \
        gtkradioaction.h        \
        gtkradiobutton.h        \
@@ -287,7 +283,6 @@ gtk_public_h_sources =          \
        gtktexttag.h            \
        gtktexttagtable.h       \
        gtktextview.h           \
-       gtktipsquery.h          \
        gtktoggleaction.h       \
        gtktogglebutton.h       \
        gtktoggletoolbutton.h   \
@@ -296,7 +291,6 @@ gtk_public_h_sources =          \
        gtktoolitem.h           \
        gtktoolshell.h          \
        gtktooltip.h            \
-       gtktooltips.h           \
        gtktreednd.h            \
        gtktreemodel.h          \
        gtktreemodelfilter.h    \
@@ -478,7 +472,6 @@ gtk_base_c_sources =            \
        gtkinputdialog.c        \
        gtkinvisible.c          \
        gtkitem.c               \
-       gtkitemfactory.c        \
        gtkkeyhash.c            \
        gtklabel.c              \
        gtklayout.c             \
@@ -502,15 +495,12 @@ gtk_base_c_sources =            \
        gtkpaned.c              \
        gtkpapersize.c          \
        gtkpathbar.c            \
-       gtkpixmap.c             \
        gtkplug.c               \
-       gtkpreview.c            \
        gtkprintcontext.c       \
        gtkprintoperation.c     \
        gtkprintoperationpreview.c      \
        gtkprintsettings.c      \
        gtkprintutils.c         \
-       gtkprogress.c           \
        gtkprogressbar.c        \
        gtkradioaction.c        \
        gtkradiobutton.c        \
@@ -564,7 +554,6 @@ gtk_base_c_sources =            \
        gtktextutil.c           \
        gtktextview.c           \
        gtkthemes.c             \
-       gtktipsquery.c          \
        gtktoggleaction.c       \
        gtktogglebutton.c       \
        gtktoggletoolbutton.c   \
@@ -573,7 +562,6 @@ gtk_base_c_sources =            \
        gtktoolitem.c           \
        gtktoolshell.c          \
        gtktooltip.c            \
-       gtktooltips.c           \
        gtktreedatalist.c       \
        gtktreednd.c            \
        gtktreemodel.c          \
@@ -602,36 +590,48 @@ gtk_base_c_sources =            \
        $(gtk_clipboard_dnd_c_sources)
 
 # Broken
-gtk_public_h_sources +=         \
-        gtktext.h               \
-        gtktree.h               \
-        gtktreeitem.h
-gtk_base_c_sources +=           \
-        gtktext.c               \
-        gtktree.c               \
-        gtktreeitem.c
+gtk_public_h_sources += \
+       gtktext.h               \
+       gtktree.h               \
+       gtktreeitem.h
+gtk_base_c_sources += \
+       gtktext.c               \
+       gtktree.c               \
+       gtktreeitem.c
 
 # Deprecated
-gtk_public_h_sources +=         \
-        gtkclist.h              \
-        gtkcombo.h              \
-        gtkctree.h              \
-        gtkfilesel.h            \
-        gtklist.h               \
-        gtklistitem.h           \
-        gtkoldeditable.h        \
-        gtkoptionmenu.h         \
-        gtksignal.h
-gtk_base_c_sources +=           \
-        gtkclist.c              \
-        gtkcombo.c              \
-        gtkctree.c              \
-        gtkfilesel.c            \
-        gtklist.c               \
-        gtklistitem.c           \
-        gtkoldeditable.c        \
-        gtkoptionmenu.c         \
-        gtksignal.c
+gtk_public_h_sources += \
+       gtkclist.h              \
+       gtkcombo.h              \
+       gtkctree.h              \
+       gtkfilesel.h            \
+       gtkitemfactory.h        \
+       gtklist.h               \
+       gtklistitem.h           \
+       gtkoldeditable.h        \
+       gtkoptionmenu.h         \
+       gtkpixmap.h             \
+       gtkpreview.h            \
+       gtkprogress.h           \
+       gtksignal.h             \
+       gtktipsquery.h          \
+       gtktooltips.h
+gtk_base_c_sources += \
+       gtkclist.c              \
+       gtkcombo.c              \
+       gtkctree.c              \
+       gtkfilesel.c            \
+       gtkitemfactory.c        \
+       gtklist.c               \
+       gtklistitem.c           \
+       gtkoldeditable.c        \
+       gtkoptionmenu.c         \
+       gtkpixmap.c             \
+       gtkpreview.c            \
+       gtkprogress.c           \
+       gtksignal.c             \
+       gtktipsquery.c          \
+       gtktooltips.c
 
 gtk_c_sources = $(gtk_base_c_sources)
 gtk_all_c_sources = $(gtk_base_c_sources)

diff --git a/gtk/gtk.h b/gtk/gtk.h
index 57eb4397018f2e4ceced8a92c312034ac1d19770..8465371b398f8180296184ff67d13040687e088b 100644 (file)
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -106,7 +106,6 @@
 #include <gtk/gtkinputdialog.h>
 #include <gtk/gtkinvisible.h>
 #include <gtk/gtkitem.h>
-#include <gtk/gtkitemfactory.h>
 #include <gtk/gtklabel.h>
 #include <gtk/gtklayout.h>
 #include <gtk/gtklinkbutton.h>
@@ -123,11 +122,8 @@
 #include <gtk/gtknotebook.h>
 #include <gtk/gtkobject.h>
 #include <gtk/gtkpaned.h>
-#include <gtk/gtkpixmap.h>
 #include <gtk/gtkplug.h>
-#include <gtk/gtkpreview.h>
 #include <gtk/gtkprintoperation.h>
-#include <gtk/gtkprogress.h>
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtkradioaction.h>
 #include <gtk/gtkradiobutton.h>
@@ -164,7 +160,6 @@
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktextbufferrichtext.h>
 #include <gtk/gtktextview.h>
-#include <gtk/gtktipsquery.h>
 #include <gtk/gtktoggleaction.h>
 #include <gtk/gtktogglebutton.h>
 #include <gtk/gtktoggletoolbutton.h>
@@ -173,7 +168,6 @@
 #include <gtk/gtktoolitem.h>
 #include <gtk/gtktoolshell.h>
 #include <gtk/gtktooltip.h>
-#include <gtk/gtktooltips.h>
 #include <gtk/gtktestutils.h>
 #include <gtk/gtktreednd.h>
 #include <gtk/gtktreemodel.h>
@@ -208,10 +202,17 @@
 #include <gtk/gtkcombo.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkfilesel.h>
+#include <gtk/gtkitemfactory.h>
 #include <gtk/gtklist.h>
 #include <gtk/gtklistitem.h>
 #include <gtk/gtkoldeditable.h>
 #include <gtk/gtkoptionmenu.h>
+#include <gtk/gtkpixmap.h>
+#include <gtk/gtkpreview.h>
+#include <gtk/gtkprogress.h>
 #include <gtk/gtksignal.h>
+#include <gtk/gtktipsquery.h>
+#include <gtk/gtktooltips.h>
+
 
 #endif /* __GTK_H__ */