types: Move widget types into gtktypes.h

This commit is contained in:
Benjamin Otte
2012-03-03 18:48:56 +01:00
parent 29324c5131
commit 9e28aa9223
3 changed files with 9 additions and 14 deletions

View File

@ -33,6 +33,13 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkRequisition GtkRequisition;
typedef struct _GtkSelectionData GtkSelectionData;
typedef struct _GtkTooltip GtkTooltip;
typedef struct _GtkWidget GtkWidget;
typedef struct _GtkWidgetPath GtkWidgetPath;
typedef struct _GtkWindow GtkWindow;
G_END_DECLS G_END_DECLS

View File

@ -35,7 +35,7 @@
#include <gtk/gtkborder.h> #include <gtk/gtkborder.h>
#include <gtk/gtksettings.h> #include <gtk/gtksettings.h>
#include <gtk/gtkstylecontext.h> #include <gtk/gtkstylecontext.h>
#include <gtk/gtkwidgetpath.h> #include <gtk/gtktypes.h>
#include <atk/atk.h> #include <atk/atk.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -59,17 +59,10 @@ typedef enum
#define GTK_TYPE_REQUISITION (gtk_requisition_get_type ()) #define GTK_TYPE_REQUISITION (gtk_requisition_get_type ())
/* forward declaration to avoid excessive includes (and concurrent includes)
*/
typedef struct _GtkRequisition GtkRequisition;
typedef struct _GtkSelectionData GtkSelectionData;
typedef struct _GtkWidgetPrivate GtkWidgetPrivate; typedef struct _GtkWidgetPrivate GtkWidgetPrivate;
typedef struct _GtkWidgetClass GtkWidgetClass; typedef struct _GtkWidgetClass GtkWidgetClass;
typedef struct _GtkWidgetClassPrivate GtkWidgetClassPrivate; typedef struct _GtkWidgetClassPrivate GtkWidgetClassPrivate;
typedef struct _GtkWidgetAuxInfo GtkWidgetAuxInfo; typedef struct _GtkWidgetAuxInfo GtkWidgetAuxInfo;
typedef struct _GtkClipboard GtkClipboard;
typedef struct _GtkTooltip GtkTooltip;
typedef struct _GtkWindow GtkWindow;
/** /**
* GtkAllocation: * GtkAllocation:

View File

@ -25,15 +25,10 @@
#include <glib-object.h> #include <glib-object.h>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkenums.h> #include <gtk/gtkenums.h>
#include <gtk/gtktypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GtkWidgetPath GtkWidgetPath;
/* We make this forward declaration here, since gtkwidget.h includes us.
*/
typedef struct _GtkWidget GtkWidget;
#define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ()) #define GTK_TYPE_WIDGET_PATH (gtk_widget_path_get_type ())
GType gtk_widget_path_get_type (void) G_GNUC_CONST; GType gtk_widget_path_get_type (void) G_GNUC_CONST;