Commit 98440ad0 authored by Matthias Clasen's avatar Matthias Clasen

Remove gtktypeutils altogether

Based on patches by Javier Jardón.

https://bugzilla.gnome.org/show_bug.cgi?id=629955
parent 1283368b
...@@ -333,7 +333,6 @@ gtk_public_h_sources = \ ...@@ -333,7 +333,6 @@ gtk_public_h_sources = \
gtktreestore.h \ gtktreestore.h \
gtktreeview.h \ gtktreeview.h \
gtktreeviewcolumn.h \ gtktreeviewcolumn.h \
gtktypeutils.h \
gtkuimanager.h \ gtkuimanager.h \
gtkvbbox.h \ gtkvbbox.h \
gtkvbox.h \ gtkvbox.h \
...@@ -662,7 +661,6 @@ gtk_base_c_sources = \ ...@@ -662,7 +661,6 @@ gtk_base_c_sources = \
gtktreeview.c \ gtktreeview.c \
gtktreeviewcolumn.c \ gtktreeviewcolumn.c \
gtktypebuiltins.c \ gtktypebuiltins.c \
gtktypeutils.c \
gtkuimanager.c \ gtkuimanager.c \
gtkvbbox.c \ gtkvbbox.c \
gtkvbox.c \ gtkvbox.c \
......
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
#include <gtk/gtktreestore.h> #include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h> #include <gtk/gtktreeview.h>
#include <gtk/gtktreeviewcolumn.h> #include <gtk/gtktreeviewcolumn.h>
#include <gtk/gtktypeutils.h> #include <gtk/gtktypebuiltins.h>
#include <gtk/gtkuimanager.h> #include <gtk/gtkuimanager.h>
#include <gtk/gtkvbbox.h> #include <gtk/gtkvbbox.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
......
...@@ -54,6 +54,7 @@ ...@@ -54,6 +54,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtktogglebutton.h" #include "gtktogglebutton.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#define __GTK_ACTION_GROUP_H__ #define __GTK_ACTION_GROUP_H__
#include <gtk/gtkaction.h> #include <gtk/gtkaction.h>
#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */ #include <gtk/gtkstock.h>
G_BEGIN_DECLS G_BEGIN_DECLS
......
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
#include "gtksizegroup.h" #include "gtksizegroup.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
......
This diff is collapsed.
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkactivatable.h" #include "gtkactivatable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
#include "gtkeventbox.h" #include "gtkeventbox.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtkvseparator.h" #include "gtkvseparator.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
......
...@@ -32,8 +32,12 @@ ...@@ -32,8 +32,12 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
...@@ -42,8 +46,6 @@ ...@@ -42,8 +46,6 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h>
/** /**
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktreeview.h" #include "gtktreeview.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
......
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
#include "gtkfilechooserbutton.h" #include "gtkfilechooserbutton.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
/* **************** * /* **************** *
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "gtkframe.h" #include "gtkframe.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
......
...@@ -26,12 +26,15 @@ ...@@ -26,12 +26,15 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gtkhandlebox.h" #include "gtkhandlebox.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -25,9 +25,11 @@ ...@@ -25,9 +25,11 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkiconcache.h" #include "gtkiconcache.h"
#include "gtkdebug.h" #include "gtkdebug.h"
...@@ -38,7 +40,7 @@ ...@@ -38,7 +40,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkbuilderprivate.h" #include "gtkbuilderprivate.h"
#include "gtktypebuiltins.h"
static GSList *all_icon_factories = NULL; static GSList *all_icon_factories = NULL;
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtktreednd.h" #include "gtktreednd.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
/** /**
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
...@@ -36,6 +37,7 @@ ...@@ -36,6 +37,7 @@
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkimage * SECTION:gtkimage
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkinfobar * SECTION:gtkinfobar
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include "gtkshow.h" #include "gtkshow.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/*rint() is only available in GCC and/or C99*/ /*rint() is only available in GCC and/or C99*/
#if (__STDC_VERSION__ < 199901L && !defined __GNUC__) #if (__STDC_VERSION__ < 199901L && !defined __GNUC__)
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtktypeutils.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#ifdef G_PLATFORM_WIN32 #ifdef G_PLATFORM_WIN32
#include <gtk/gtkbox.h> #include <gtk/gtkbox.h>
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region #define NAVIGATION_REGION_OVERSHOOT 50 /* How much the navigation region
* extends below the submenu * extends below the submenu
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtksizerequest.h" #include "gtksizerequest.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#define BORDER_SPACING 0 #define BORDER_SPACING 0
#define DEFAULT_IPADDING 1 #define DEFAULT_IPADDING 1
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkactivatable.h" #include "gtkactivatable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
enum { enum {
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define MENU_SHELL_TIMEOUT 500 #define MENU_SHELL_TIMEOUT 500
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
...@@ -39,6 +40,7 @@ ...@@ -39,6 +40,7 @@
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkmessagedialog * SECTION:gtkmessagedialog
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtktypebuiltins.h"
/** /**
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkorientable.h" #include "gtkorientable.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -21,16 +21,18 @@ ...@@ -21,16 +21,18 @@
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include <cairo-pdf.h>
#include "gtkprintoperation-private.h" #include "gtkprintoperation-private.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include <cairo-pdf.h>
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtktypebuiltins.h"
#define SHOW_PROGRESS_TIME 1200 #define SHOW_PROGRESS_TIME 1200
......
...@@ -19,12 +19,16 @@ ...@@ -19,12 +19,16 @@
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <gtk/gtk.h>
#include "gtkprintsettings.h" #include "gtkprintsettings.h"
#include "gtkprintutils.h" #include "gtkprintutils.h"
#include "gtktypebuiltins.h"
#include "gtkwidget.h"
typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass; typedef struct _GtkPrintSettingsClass GtkPrintSettingsClass;
......
...@@ -20,14 +20,20 @@ ...@@ -20,14 +20,20 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include "gtkintl.h" #include "gtkprintunixdialog.h"
#include "gtkprivate.h"
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter-private.h"
#include "gtkprinteroptionwidget.h"
#include "gtkprintutils.h"
#include "gtkspinbutton.h" #include "gtkspinbutton.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
...@@ -49,16 +55,11 @@ ...@@ -49,16 +55,11 @@
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkeventbox.h" #include "gtkeventbox.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkcustompaperunixdialog.h"
#include "gtkprintbackend.h"
#include "gtkprinter-private.h"
#include "gtkprintunixdialog.h"
#include "gtkprinteroptionwidget.h"
#include "gtkprintutils.h"
#include "gtkmessagedialog.h" #include "gtkmessagedialog.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtktypebuiltins.h"
#define EXAMPLE_PAGE_AREA_SIZE 110 #define EXAMPLE_PAGE_AREA_SIZE 110
#define RULER_DISTANCE 7.5 #define RULER_DISTANCE 7.5
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkrange * SECTION:gtkrange
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
/** /**
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include "gtkintl.h" #include "gtkintl.h"
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include "gtksettings.h" #include "gtksettings.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h"
#define MIN_SPIN_BUTTON_WIDTH 30 #define MIN_SPIN_BUTTON_WIDTH 30
#define MAX_TIMER_CALLS 5 #define MAX_TIMER_CALLS 5
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
*/ */
#include "config.h" #include "config.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
...@@ -34,6 +35,7 @@ ...@@ -34,6 +35,7 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtktypebuiltins.h"
/** /**
* SECTION:gtkstatusbar * SECTION:gtkstatusbar
......
...@@ -42,27 +42,19 @@ ...@@ -42,27 +42,19 @@
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtktooltip.h" #include "gtktooltip.h"
#include "gtkicontheme.h"
#include "gtklabel.h"
#include "gtktypebuiltins.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "gdk/x11/gdkx.h" #include "gdk/x11/gdkx.h"
#endif #endif
#ifdef GDK_WINDOWING_WIN32
#include "gdk/win32/gdkwin32.h"
#endif
#ifdef GDK_WINDOWING_WIN32 #ifdef GDK_WINDOWING_WIN32
#include "gtkicontheme.h" #include "gdk/win32/gdkwin32.h"
#include "gtklabel.h"
#include "win32/gdkwin32.h"
#define WM_GTK_TRAY_NOTIFICATION (WM_USER+1) #define WM_GTK_TRAY_NOTIFICATION (WM_USER+1)
#endif #endif
#ifdef GDK_WINDOWING_QUARTZ
#include "gtkicontheme.h"
#include "gtklabel.h"
#endif
#define BLINK_TIMEOUT 500 #define BLINK_TIMEOUT 500
enum enum
......
...@@ -33,10 +33,23 @@ ...@@ -33,10 +33,23 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
G_BEGIN_DECLS G_BEGIN_DECLS
/*
* GtkTranslateFunc:
* @path: The id of the message. In #GtkActionGroup this will be a label
* or tooltip from a #GtkActionEntry.
* @func_data: user data passed in when registering the function
*
* The function used to translate messages in e.g. #GtkIconFactory
* and #GtkActionGroup.
*
* Returns: the translated message
*/
typedef gchar * (*GtkTranslateFunc) (const gchar *path,
gpointer func_data);
typedef struct _GtkStockItem GtkStockItem; typedef struct _GtkStockItem GtkStockItem;
struct _GtkStockItem struct _GtkStockItem
......
...@@ -48,6 +48,10 @@ ...@@ -48,6 +48,10 @@
*/ */
#include "config.h" #include "config.h"
#include <stdlib.h>
#include <string.h>
#include "gtkmain.h" #include "gtkmain.h"
#include "gtktexttag.h" #include "gtktexttag.h"
#include "gtktexttypes.h" #include "gtktexttypes.h"
...@@ -55,9 +59,7 @@ ...@@ -55,9 +59,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtktypebuiltins.h"
#include <stdlib.h>
#include <string.h>
enum { enum {
EVENT, EVENT,
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include "gtkwidgetprivate.h" #include "gtkwidgetprivate.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkscrollable.h" #include "gtkscrollable.h"
#include "gtktypebuiltins.h"