gtk+ r20977 - in trunk: . gtk tests

[mitch svn gnome org]

Author: mitch
Date: Mon Aug  4 16:12:23 2008
New Revision: 20977
URL: http://svn.gnome.org/viewvc/gtk+?rev=20977&view=rev

Log:
2008-08-04  Michael Natterer  <mitch imendio com>

	* gtk/gtkseparatortoolitem.c
	* tests/testactions.c: remove pointless #undef GTK_DISABLE_DEPRECATED.

	* gtk/gtkcalendar.c (calendar_set_display_option): use
	gtk_calendar_set_display_options() instead of the deprecated
	gtk_calendar_display_options().



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkcalendar.c
   trunk/gtk/gtkseparatortoolitem.c
   trunk/tests/testactions.c

Modified: trunk/gtk/gtkcalendar.c
==============================================================================
--- trunk/gtk/gtkcalendar.c	(original)
+++ trunk/gtk/gtkcalendar.c	Mon Aug  4 16:12:23 2008
@@ -47,9 +47,7 @@
 #include <windows.h>
 #endif
 
-#undef GTK_DISABLE_DEPRECATED
 #include "gtkcalendar.h"
-
 #include "gtkdnd.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
@@ -1269,7 +1267,7 @@
     flags = calendar->display_flags | flag;
   else
     flags = calendar->display_flags & ~flag; 
-  gtk_calendar_display_options (calendar, flags);
+  gtk_calendar_set_display_options (calendar, flags);
 }
 
 static gboolean

Modified: trunk/gtk/gtkseparatortoolitem.c
==============================================================================
--- trunk/gtk/gtkseparatortoolitem.c	(original)
+++ trunk/gtk/gtkseparatortoolitem.c	Mon Aug  4 16:12:23 2008
@@ -19,8 +19,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
-
 #include "config.h"
 #include "gtkseparatormenuitem.h"
 #include "gtkseparatortoolitem.h"

Modified: trunk/tests/testactions.c
==============================================================================
--- trunk/tests/testactions.c	(original)
+++ trunk/tests/testactions.c	Mon Aug  4 16:12:23 2008
@@ -17,7 +17,6 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#undef GTK_DISABLE_DEPRECATED
 #include "config.h"
 #include <gtk/gtk.h>