[libegg/spread-table-dnd: 13/78] column-chooser: Ported to GTK+ 3.

[Tristan Van Berkom <tvb src gnome org>]

commit ea730e14207348d568b81d85771b6284d33c9a3f
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Mar 18 23:27:26 2011 +0100

    column-chooser: Ported to GTK+ 3.

 libegg/column-chooser/Makefile.am              |    6 +++---
 libegg/column-chooser/eggcolumnchooserdialog.c |   14 ++------------
 libegg/column-chooser/eggcolumnchooserdialog.h |    4 +---
 libegg/column-chooser/eggcolumnmodel.c         |    3 +--
 libegg/column-chooser/eggcolumnmodel.h         |    2 +-
 5 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/libegg/column-chooser/Makefile.am b/libegg/column-chooser/Makefile.am
index c220da5..50679fd 100644
--- a/libegg/column-chooser/Makefile.am
+++ b/libegg/column-chooser/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = \
-  $(EGG_CFLAGS) \
+  $(EGG_30_CFLAGS) \
   -DEGG_COMPILATION \
   -DG_DISABLE_DEPRECATED \
   -DGDK_DISABLE_DEPRECATED \
@@ -7,7 +7,7 @@ INCLUDES = \
 
 noinst_LTLIBRARIES = libegg-columnchooser.la
 
-libegg_columnchooser_la_LIBADD = $(EGG_LIBS)
+libegg_columnchooser_la_LIBADD = $(EGG_30_LIBS)
 libegg_columnchooser_la_SOURCES = \
 	eggcolumnchooserdialog.c	\
 	eggcolumnmodel.c
@@ -20,5 +20,5 @@ noinst_HEADERS = \
 noinst_PROGRAMS = test-tree-column
 
 test_tree_column_SOURCES = test-tree-column.c
-test_tree_column_LDADD = libegg-columnchooser.la $(EGG_LIBS)
+test_tree_column_LDADD = libegg-columnchooser.la $(EGG_30_LIBS)
 test_tree_column_DEPENDENCIES = libegg-columnchooser.la
diff --git a/libegg/column-chooser/eggcolumnchooserdialog.c b/libegg/column-chooser/eggcolumnchooserdialog.c
index 624e9a5..b120714 100644
--- a/libegg/column-chooser/eggcolumnchooserdialog.c
+++ b/libegg/column-chooser/eggcolumnchooserdialog.c
@@ -20,17 +20,7 @@
 
 #include "eggcolumnchooserdialog.h"
 
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktreeselection.h>
+#include <gtk/gtk.h>
 
 #include "eggcolumnmodel.h"
 
@@ -233,7 +223,7 @@ egg_column_chooser_dialog_init (EggColumnChooserDialog *dialog)
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 	
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), vbox, TRUE, TRUE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 8);
 
 	
diff --git a/libegg/column-chooser/eggcolumnchooserdialog.h b/libegg/column-chooser/eggcolumnchooserdialog.h
index 1399242..cbf673b 100644
--- a/libegg/column-chooser/eggcolumnchooserdialog.h
+++ b/libegg/column-chooser/eggcolumnchooserdialog.h
@@ -22,9 +22,7 @@
 #ifndef __EGG_COLUMN_CHOOSER_DIALOG_H__
 #define __EGG_COLUMN_CHOOSER_DIALOG_H__
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 
 #include "eggcolumnmodel.h"
 
diff --git a/libegg/column-chooser/eggcolumnmodel.c b/libegg/column-chooser/eggcolumnmodel.c
index cb45452..cfe8f97 100644
--- a/libegg/column-chooser/eggcolumnmodel.c
+++ b/libegg/column-chooser/eggcolumnmodel.c
@@ -20,8 +20,7 @@
 
 #include "eggcolumnmodel.h"
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 
 static void update_columns (GtkTreeView *tree_view, EggColumnModel *column_model);
 
diff --git a/libegg/column-chooser/eggcolumnmodel.h b/libegg/column-chooser/eggcolumnmodel.h
index 39fd305..933e83e 100644
--- a/libegg/column-chooser/eggcolumnmodel.h
+++ b/libegg/column-chooser/eggcolumnmodel.h
@@ -21,7 +21,7 @@
 #ifndef __EGG_COLUMN_MODEL_H__
 #define __EGG_COLUMN_MODEL_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS