Commit 293ed565 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

Need to do the GTK_DISABLE_DEPRECATED #undef/#define dance here, too,

2008-06-17  Tor Lillqvist  <tml@novell.com>

	* gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
	#undef/#define dance here, too, because
	gtk_notebook_set_group_id() is deprecated but used here before it
	is defined, and gcc complains about conflicting type from the
	implicit int declaration when it sees the actual void definition.


svn path=/trunk/; revision=20435
parent 7ff875bb
2008-06-17 Tor Lillqvist <tml@novell.com>
* gtk/gtknotebook.c: Need to do the GTK_DISABLE_DEPRECATED
#undef/#define dance here, too, because
gtk_notebook_set_group_id() is deprecated but used here before it
is defined, and gcc complains about conflicting type from the
implicit int declaration when it sees the actual void definition.
* modules/input/gtkimcontextime.h: Don't use the deprecated GTK_*
GtkType macros.
......
......@@ -26,20 +26,27 @@
*/
#include <config.h>
#include <stdio.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
#undef GTK_DISABLE_DEPRECATED
#include "gtknotebook.h"
#include "gtkmain.h"
#include "gtkmenu.h"
#include "gtkmenuitem.h"
#include "gtklabel.h"
#include <gdk/gdkkeysyms.h>
#include <stdio.h>
#include "gtkintl.h"
#include "gtkmarshalers.h"
#include "gtkbindings.h"
#include "gtkprivate.h"
#include "gtkdnd.h"
#include "gtkbuildable.h"
#define GTK_DISABLE_DEPRECATED
#include "gtkalias.h"
#define SCROLL_DELAY_FACTOR 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment