muine r1184 - in trunk: . libmuine

[wbolster svn gnome org]

Author: wbolster
Date: Fri Jul  4 14:51:27 2008
New Revision: 1184
URL: http://svn.gnome.org/viewvc/muine?rev=1184&view=rev

Log:
2008-07-04  Wouter Bolsterlee  <wbolster svn gnome org>

	* libmuine/pointer-list-model.c:
	* libmuine/pointer-list-model.h:

	Include <gtk/gtk.h> directly (this is recommended by
	upstream) and convert some gtk type checking macros to
	the corresponding glib ones.



Modified:
   trunk/ChangeLog
   trunk/libmuine/pointer-list-model.c
   trunk/libmuine/pointer-list-model.h

Modified: trunk/libmuine/pointer-list-model.c
==============================================================================
--- trunk/libmuine/pointer-list-model.c	(original)
+++ trunk/libmuine/pointer-list-model.c	Fri Jul  4 14:51:27 2008
@@ -20,9 +20,12 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtktreednd.h>
 #include <config.h>
+
 #include <string.h>
+
+#include <gtk/gtk.h>
+
 #include "pointer-list-model.h"
 #include "macros.h"
 

Modified: trunk/libmuine/pointer-list-model.h
==============================================================================
--- trunk/libmuine/pointer-list-model.h	(original)
+++ trunk/libmuine/pointer-list-model.h	Fri Jul  4 14:51:27 2008
@@ -22,16 +22,15 @@
 #ifndef __POINTER_LIST_MODEL_H__
 #define __POINTER_LIST_MODEL_H__
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "gsequence.h"
 
 #define TYPE_POINTER_LIST_MODEL		 (pointer_list_model_get_type ())
-#define POINTER_LIST_MODEL(obj)		 (GTK_CHECK_CAST ((obj), TYPE_POINTER_LIST_MODEL, PointerListModel))
-#define POINTER_LIST_MODEL_CLASS(klass)	 (GTK_CHECK_CLASS_CAST ((klass), TYPE_POINTER_LIST_MODEL, PointerListModelClass))
-#define IS_POINTER_LIST_MODEL(obj)	  (GTK_CHECK_TYPE ((obj), TYPE_POINTER_LIST_MODEL))
-#define IS_POINTER_LIST_MODEL_CLASS(klass)  (GTK_CHECK_CLASS_TYPE ((obj), TYPE_POINTER_LIST_MODEL))
-#define POINTER_LIST_MODEL_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), TYPE_POINTER_LIST_MODEL, PointerListModelClass))
+#define POINTER_LIST_MODEL(obj)		 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_POINTER_LIST_MODEL, PointerListModel))
+#define POINTER_LIST_MODEL_CLASS(klass)	 (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_POINTER_LIST_MODEL, PointerListModelClass))
+#define IS_POINTER_LIST_MODEL(obj)	  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_POINTER_LIST_MODEL))
+#define IS_POINTER_LIST_MODEL_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((obj), TYPE_POINTER_LIST_MODEL))
+#define POINTER_LIST_MODEL_GET_CLASS(obj)   (G_TYPE_CHECK_GET_CLASS ((obj), TYPE_POINTER_LIST_MODEL, PointerListModelClass))
 
 typedef struct _PointerListModel PointerListModel;
 typedef struct _PointerListModelClass PointerListModelClass;