gtksourceview r1973 - in branches/gnome-2-18: . gtksourceview

[kmaraas svn gnome org]

Author: kmaraas
Date: Fri Jun 20 22:51:05 2008
New Revision: 1973
URL: http://svn.gnome.org/viewvc/gtksourceview?rev=1973&view=rev

Log:
2008-06-21  Kjartan Maraas  <kmaraas gnome org>

	* gtksourceview/gtksourcelanguage.c:
	* gtksourceview/gtksourcelanguage.h:
	* gtksourceview/gtksourcelanguagesmanager.h:
	* gtksourceview/gtksourceregex.c:
	* gtksourceview/gtksourceundomanager.h:
	Don't use deprecated GTK_CHECK* macros.

Modified:
   branches/gnome-2-18/ChangeLog
   branches/gnome-2-18/gtksourceview/gtksourcelanguage.c
   branches/gnome-2-18/gtksourceview/gtksourcelanguage.h
   branches/gnome-2-18/gtksourceview/gtksourcelanguagesmanager.h
   branches/gnome-2-18/gtksourceview/gtksourceregex.c
   branches/gnome-2-18/gtksourceview/gtksourceundomanager.h

Modified: branches/gnome-2-18/gtksourceview/gtksourcelanguage.c
==============================================================================
--- branches/gnome-2-18/gtksourceview/gtksourcelanguage.c	(original)
+++ branches/gnome-2-18/gtksourceview/gtksourcelanguage.c	Fri Jun 20 22:51:05 2008
@@ -30,8 +30,7 @@
 
 #include <libxml/xmlreader.h>
 
-#include <glib/gstdio.h>
-#include <glib/gmappedfile.h>
+#include <glib.h>
 
 #include "gtksourceview-i18n.h"
 

Modified: branches/gnome-2-18/gtksourceview/gtksourcelanguage.h
==============================================================================
--- branches/gnome-2-18/gtksourceview/gtksourcelanguage.h	(original)
+++ branches/gnome-2-18/gtksourceview/gtksourcelanguage.h	Fri Jun 20 22:51:05 2008
@@ -30,10 +30,10 @@
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SOURCE_LANGUAGE		(gtk_source_language_get_type ())
-#define GTK_SOURCE_LANGUAGE(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))
-#define GTK_SOURCE_LANGUAGE_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
-#define GTK_IS_SOURCE_LANGUAGE(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))
-#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))
+#define GTK_SOURCE_LANGUAGE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguage))
+#define GTK_SOURCE_LANGUAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
+#define GTK_IS_SOURCE_LANGUAGE(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGE))
+#define GTK_IS_SOURCE_LANGUAGE_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGE))
 #define GTK_SOURCE_LANGUAGE_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_SOURCE_LANGUAGE, GtkSourceLanguageClass))
 
 

Modified: branches/gnome-2-18/gtksourceview/gtksourcelanguagesmanager.h
==============================================================================
--- branches/gnome-2-18/gtksourceview/gtksourcelanguagesmanager.h	(original)
+++ branches/gnome-2-18/gtksourceview/gtksourcelanguagesmanager.h	Fri Jun 20 22:51:05 2008
@@ -27,10 +27,10 @@
 G_BEGIN_DECLS
 
 #define GTK_TYPE_SOURCE_LANGUAGES_MANAGER		(gtk_source_languages_manager_get_type ())
-#define GTK_SOURCE_LANGUAGES_MANAGER(obj)		(GTK_CHECK_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))
-#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))
-#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
-#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
+#define GTK_SOURCE_LANGUAGES_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManager))
+#define GTK_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER, GtkSourceLanguagesManagerClass))
+#define GTK_IS_SOURCE_LANGUAGES_MANAGER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
+#define GTK_IS_SOURCE_LANGUAGES_MANAGER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_SOURCE_LANGUAGES_MANAGER))
 
 
 typedef struct _GtkSourceLanguagesManager		GtkSourceLanguagesManager;

Modified: branches/gnome-2-18/gtksourceview/gtksourceregex.c
==============================================================================
--- branches/gnome-2-18/gtksourceview/gtksourceregex.c	(original)
+++ branches/gnome-2-18/gtksourceview/gtksourceregex.c	Fri Jun 20 22:51:05 2008
@@ -22,6 +22,7 @@
 #include <config.h>
 #endif
 
+#define _GNU_SOURCE
 #include <string.h>
 #include <stdlib.h>
 #include <glib.h>

Modified: branches/gnome-2-18/gtksourceview/gtksourceundomanager.h
==============================================================================
--- branches/gnome-2-18/gtksourceview/gtksourceundomanager.h	(original)
+++ branches/gnome-2-18/gtksourceview/gtksourceundomanager.h	Fri Jun 20 22:51:05 2008
@@ -29,11 +29,11 @@
 #include <gtk/gtktextbuffer.h>
 
 #define GTK_SOURCE_TYPE_UNDO_MANAGER             	(gtk_source_undo_manager_get_type ())
-#define GTK_SOURCE_UNDO_MANAGER(obj)			(GTK_CHECK_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
-#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
-#define GTK_SOURCE_IS_UNDO_MANAGER(obj)			(GTK_CHECK_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
-#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass)  	(GTK_CHECK_CLASS_TYPE ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
-#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  	(GTK_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+#define GTK_SOURCE_UNDO_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
+#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+#define GTK_SOURCE_IS_UNDO_MANAGER(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
+#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass)  	(G_TYPE_CHECK_CLASS_CAST ((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
+#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  	(G_TYPE_CHECK_GET_CLASS ((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
 
 
 typedef struct _GtkSourceUndoManager        	GtkSourceUndoManager;