callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gtk/gtkclist.h revert includes to how they have been before the

Browse Source 
2008-06-03  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkclist.h
	* gtk/gtkctree.h: revert includes to how they have been before the
	GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
	that you can't include <gtk/gtk.h> from two headers where one is a
	parent class of the other and expect them both to be includable
	individually.


svn path=/trunk/; revision=20302
This commit is contained in:
Michael Natterer
2008-06-03 08:38:59 +00:00
committed by Michael Natterer
parent af55cea3ef
commit 54d9b40015
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-06-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkclist.h
* gtk/gtkctree.h: revert includes to how they have been before the
GTK_DISABLE_SINGLE_INCLUDES changes. Apparently I missed the fact
that you can't include <gtk/gtk.h> from two headers where one is a
parent class of the other and expect them both to be includable
individually.
2008-06-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkprinteroptionset.h: remove newline at beginning of file.

13
gtk/gtkclist.h
View File

@ -22,7 +22,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
@ -30,7 +30,14 @@
#ifndef __GTK_CLIST_H__
#define __GTK_CLIST_H__
#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkalignment.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkhscrollbar.h>
#include <gtk/gtkvscrollbar.h>
#include <gtk/gtkenums.h>
G_BEGIN_DECLS
@ -48,7 +55,7 @@ enum {
GTK_CLIST_USE_DRAG_ICONS = 1 << 8,
GTK_CLIST_DRAW_DRAG_LINE = 1 << 9,
GTK_CLIST_DRAW_DRAG_RECT = 1 << 10
};
};
/* cell types */
typedef enum

4
gtk/gtkctree.h
View File

@ -25,7 +25,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_DISABLE_DEPRECATED
@ -33,7 +33,7 @@
#ifndef __GTK_CTREE_H__
#define __GTK_CTREE_H__
#include <gtk/gtk.h>
#include <gtk/gtkclist.h>
G_BEGIN_DECLS