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

Make PLT-reduction work with gcc4, and don't include everything in

Browse Source 
2005-03-20  Matthias Clasen  <mclasen@redhat.com>

	Make PLT-reduction work with gcc4, and don't include
	everything in gdkalias.h:

	* gtk/grk.symbols: Group symbols by header and source file.
	* gtk/makegtkalias.pl: Protect definitions by the same
	preprocessor symbols used to guard the headers. Move
	the alias declarations to a separate file which is
	produced when calling makegtkalias.pl -def
	* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
	this file.
	* gtk/*.c: Include gtkalias.h after the other headers,
	include gtkaliasdef.c at the bottom.
	* gtk/*.h: Small cleanups.
This commit is contained in:
Matthias Clasen 2005-03-20 07:01:23 +00:00 committed by Matthias Clasen
parent b39b0bfc04
commit cca8dd6347
298 changed files with 2537 additions and 1551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com> Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb): * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):

16
ChangeLog.pre-2-10
View File

@ -1,3 +1,19 @@
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com> Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb): * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):

16
ChangeLog.pre-2-8
View File

@ -1,3 +1,19 @@
2005-03-20 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in gdkalias.h:
* gtk/grk.symbols: Group symbols by header and source file.
* gtk/makegtkalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegtkalias.pl -def
* gdk/Makefile.am (gtkaliasdef.c): Add a rule to generate
this file.
* gtk/*.c: Include gtkalias.h after the other headers,
include gtkaliasdef.c at the bottom.
* gtk/*.h: Small cleanups.
Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com> Fri Mar 18 23:59:49 2005 Soeren Sandmann <sandmann@redhat.com>
* gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb): * gtk/gtkmenutoolbutton.c (arrow_button_button_press_event_cb):

8
gtk/Makefile.am
View File

@ -75,10 +75,12 @@ uninstall-ms-lib:
endif endif
gtk.def: gtk.symbols gtk.def: gtk.symbols
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
gtkalias.h: gtk.symbols gtkalias.h: gtk.symbols
$(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
gtkaliasdef.c: gtk.symbols
$(PERL) $(srcdir)/makegtkalias.pl -def < $(srcdir)/gtk.symbols > gtkaliasdef.c
if OS_LINUX if OS_LINUX
TESTS = abicheck.sh TESTS = abicheck.sh
@ -553,6 +555,7 @@ gtk_built_private_headers = \
gtkmarshalers.h gtkmarshalers.h
gtk_built_sources = \ gtk_built_sources = \
gtkaliasdef.c \
gtktypebuiltins.c \ gtktypebuiltins.c \
gtkmarshalers.c \ gtkmarshalers.c \
gtkmarshalers.h \ gtkmarshalers.h \
@ -636,7 +639,8 @@ stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) Makefile
&& echo timestamp > $(@F) && echo timestamp > $(@F)
gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile gtktypebuiltins.c: @REBUILD@ $(gtk_public_h_sources) Makefile
( cd $(srcdir) && glib-mkenums \ ( cd $(srcdir) && glib-mkenums \
--fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtkalias.h\"\n#include \"gtk.h\"\n#include \"gtkprivate.h\"" \ --fhead "#undef GTK_DISABLE_DEPRECATED\n#define GTK_ENABLE_BROKEN\n#include \"gtk.h\"\n#include \"gtkprivate.h\"\n#include \"gtkalias.h\"\n" \
--ftail "#define __GTK_TYPE_BUILTINS_C__\n#include \"gtkaliasdef.c\"\n" \
--fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \

2
gtk/abicheck.sh
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi cpp -P -DG_OS_UNIX -DGTK_WINDOWING_X11 -DALL_FILES ${srcdir:-.}/gtk.symbols | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE//' | sort > expected-abi
nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi nm -D .libs/libgtk-x11-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
diff -u expected-abi actual-abi && rm expected-abi actual-abi diff -u expected-abi actual-abi && rm expected-abi actual-abi

2
gtk/fnmatch.c
View File

@ -41,8 +41,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#endif #endif
#include "gtkalias.h"
static gunichar static gunichar
get_char (const char **str) get_char (const char **str)
{ {

1938
gtk/gtk.symbols
View File

File diff suppressed because it is too large Load Diff

7
gtk/gtkaboutdialog.c
View File

@ -32,8 +32,6 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtkalias.h"
#include "gtkaboutdialog.h" #include "gtkaboutdialog.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkbbox.h" #include "gtkbbox.h"
@ -51,6 +49,8 @@
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#include <string.h> #include <string.h>
typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate; typedef struct _GtkAboutDialogPrivate GtkAboutDialogPrivate;
@ -2219,3 +2219,6 @@ gtk_show_about_dialog (GtkWindow *parent,
gtk_window_present (GTK_WINDOW (dialog)); gtk_window_present (GTK_WINDOW (dialog));
} }
#define __GTK_ABOUT_DIALOG_C__
#include "gtkaliasdef.c"

5
gtk/gtkaccelgroup.c
View File

@ -28,7 +28,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkaccelgroup.h" #include "gtkaccelgroup.h"
#include "gtkaccellabel.h" /* For _gtk_accel_label_class_get_accelerator_label */ #include "gtkaccellabel.h" /* For _gtk_accel_label_class_get_accelerator_label */
#include "gtkaccelmap.h" #include "gtkaccelmap.h"
@ -36,6 +35,7 @@
#include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */ #include "gtkmain.h" /* For _gtk_boolean_handled_accumulator */
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
/* --- prototypes --- */ /* --- prototypes --- */
@ -1246,3 +1246,6 @@ gtk_accelerator_get_default_mod_mask (void)
{ {
return default_accel_mod_mask; return default_accel_mod_mask;
} }
#define __GTK_ACCEL_GROUP_C__
#include "gtkaliasdef.c"

5
gtk/gtkaccellabel.c
View File

@ -30,11 +30,11 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
#include "gtkaccelmap.h" #include "gtkaccelmap.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
PROP_0, PROP_0,
@ -636,3 +636,6 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
return FALSE; return FALSE;
} }
#define __GTK_ACCEL_LABEL_C__
#include "gtkaliasdef.c"

5
gtk/gtkaccelmap.c
View File

@ -19,11 +19,11 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkaccelmap.h" #include "gtkaccelmap.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkwindow.h" /* in lack of GtkAcceleratable */ #include "gtkwindow.h" /* in lack of GtkAcceleratable */
#include "gtkalias.h"
#include <glib/gstdio.h> #include <glib/gstdio.h>
@ -1028,3 +1028,6 @@ gtk_accel_map_save (const gchar *file_name)
} }
#endif #endif
#define __GTK_ACCEL_MAP_C__
#include "gtkaliasdef.c"

5
gtk/gtkaccessible.c
View File

@ -20,9 +20,9 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkalias.h"
static void gtk_accessible_class_init (GtkAccessibleClass *klass); static void gtk_accessible_class_init (GtkAccessibleClass *klass);
@ -93,3 +93,6 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
&accessible->widget); &accessible->widget);
} }
} }
#define __GTK_ACCESSIBLE_C__
#include "gtkaliasdef.c"

9
gtk/gtkaccessible.h
View File

@ -23,9 +23,7 @@
#include <atk/atk.h> #include <atk/atk.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type ()) #define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type ())
#define GTK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible)) #define GTK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
@ -69,10 +67,7 @@ GType gtk_accessible_get_type (void) G_GNUC_CONST;
void gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible); void gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_ACCESSIBLE_H__ */ #endif /* __GTK_ACCESSIBLE_H__ */

5
gtk/gtkaction.c
View File

@ -30,7 +30,6 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkaction.h" #include "gtkaction.h"
#include "gtkactiongroup.h" #include "gtkactiongroup.h"
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
@ -45,6 +44,7 @@
#include "gtktearoffmenuitem.h" #include "gtktearoffmenuitem.h"
#include "gtktoolbutton.h" #include "gtktoolbutton.h"
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include "gtkalias.h"
#define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate)) #define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate))
@ -1574,3 +1574,6 @@ gtk_action_disconnect_accelerator (GtkAction *action)
gtk_accel_group_disconnect (action->private_data->accel_group, gtk_accel_group_disconnect (action->private_data->accel_group,
action->private_data->accel_closure); action->private_data->accel_closure);
} }
#define __GTK_ACTION_C__
#include "gtkaliasdef.c"

5
gtk/gtkactiongroup.c
View File

@ -30,7 +30,6 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkactiongroup.h" #include "gtkactiongroup.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtktoggleaction.h" #include "gtktoggleaction.h"
@ -38,6 +37,7 @@
#include "gtkaccelmap.h" #include "gtkaccelmap.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate)) #define GTK_ACTION_GROUP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION_GROUP, GtkActionGroupPrivate))
@ -1120,3 +1120,6 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group,
{ {
g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action); g_signal_emit (action_group, action_group_signals[POST_ACTIVATE], 0, action);
} }
#define __GTK_ACTION_GROUP_C__
#include "gtkaliasdef.c"

5
gtk/gtkadjustment.c
View File

@ -25,10 +25,10 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkadjustment.h" #include "gtkadjustment.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
enum enum
{ {
@ -421,3 +421,6 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
if (need_emission) if (need_emission)
gtk_adjustment_value_changed (adjustment); gtk_adjustment_value_changed (adjustment);
} }
#define __GTK_ADJUSTMENT_C__
#include "gtkaliasdef.c"

5
gtk/gtkalignment.c
View File

@ -25,9 +25,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkalignment.h" #include "gtkalignment.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
PROP_0, PROP_0,
@ -619,3 +619,6 @@ gtk_alignment_get_padding (GtkAlignment *alignment,
if(padding_right) if(padding_right)
*padding_right = priv->padding_right; *padding_right = priv->padding_right;
} }
#define __GTK_ALIGNMENT_C__
#include "gtkaliasdef.c"

5
gtk/gtkarrow.c
View File

@ -26,9 +26,9 @@
#include <config.h> #include <config.h>
#include <math.h> #include <math.h>
#include "gtkalias.h"
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define MIN_ARROW_SIZE 15 #define MIN_ARROW_SIZE 15
@ -288,3 +288,6 @@ gtk_arrow_expose (GtkWidget *widget,
return FALSE; return FALSE;
} }
#define __GTK_ARROW_C__
#include "gtkaliasdef.c"

5
gtk/gtkaspectframe.c
View File

@ -30,9 +30,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkaspectframe.h" #include "gtkaspectframe.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
PROP_0, PROP_0,
@ -335,3 +335,6 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame,
else else
parent_class->compute_child_allocation (frame, child_allocation); parent_class->compute_child_allocation (frame, child_allocation);
} }
#define __GTK_ASPECT_FRAME_C__
#include "gtkaliasdef.c"

10
gtk/gtkaspectframe.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtkbin.h> #include <gtk/gtkbin.h>
#include <gtk/gtkframe.h> #include <gtk/gtkframe.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ()) #define GTK_TYPE_ASPECT_FRAME (gtk_aspect_frame_get_type ())
#define GTK_ASPECT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame)) #define GTK_ASPECT_FRAME(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ASPECT_FRAME, GtkAspectFrame))
@ -79,9 +76,6 @@ void gtk_aspect_frame_set (GtkAspectFrame *aspect_frame,
gboolean obey_child); gboolean obey_child);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_ASPECT_FRAME_H__ */ #endif /* __GTK_ASPECT_FRAME_H__ */

5
gtk/gtkbbox.c
View File

@ -25,9 +25,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkbbox.h" #include "gtkbbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
PROP_0, PROP_0,
@ -503,3 +503,6 @@ _gtk_button_box_child_requisition (GtkWidget *widget,
if (height) if (height)
*height = needed_height; *height = needed_height;
} }
#define __GTK_BUTTON_BOX_C__
#include "gtkaliasdef.c"

10
gtk/gtkbbox.h
View File

@ -30,10 +30,7 @@
#include <gtk/gtkbox.h> #include <gtk/gtkbox.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_BUTTON_BOX (gtk_button_box_get_type ()) #define GTK_TYPE_BUTTON_BOX (gtk_button_box_get_type ())
#define GTK_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox)) #define GTK_BUTTON_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON_BOX, GtkButtonBox))
@ -99,10 +96,7 @@ void _gtk_button_box_child_requisition (GtkWidget *widget,
int *nvis_secondaries, int *nvis_secondaries,
int *width, int *width,
int *height); int *height);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_BUTTON_BOX_H__ */ #endif /* __GTK_BUTTON_BOX_H__ */

5
gtk/gtkbin.c
View File

@ -25,8 +25,8 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkbin.h" #include "gtkbin.h"
#include "gtkalias.h"
static void gtk_bin_class_init (GtkBinClass *klass); static void gtk_bin_class_init (GtkBinClass *klass);
@ -183,3 +183,6 @@ gtk_bin_get_child (GtkBin *bin)
return bin->child; return bin->child;
} }
#define __GTK_BIN_C__
#include "gtkaliasdef.c"

10
gtk/gtkbin.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtkcontainer.h> #include <gtk/gtkcontainer.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_BIN (gtk_bin_get_type ()) #define GTK_TYPE_BIN (gtk_bin_get_type ())
#define GTK_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin)) #define GTK_BIN(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BIN, GtkBin))
@ -65,9 +62,6 @@ GType gtk_bin_get_type (void) G_GNUC_CONST;
GtkWidget *gtk_bin_get_child (GtkBin *bin); GtkWidget *gtk_bin_get_child (GtkBin *bin);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_BIN_H__ */ #endif /* __GTK_BIN_H__ */

5
gtk/gtkbindings.c
View File

@ -31,11 +31,11 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include <gdkkeysyms.h> #include <gdkkeysyms.h>
#include "gtkalias.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkkeyhash.h" #include "gtkkeyhash.h"
#include "gtkwidget.h" #include "gtkwidget.h"
#include "gtkrc.h" #include "gtkrc.h"
#include "gtkalias.h"
/* --- defines --- */ /* --- defines --- */
@ -1504,3 +1504,6 @@ _gtk_binding_signal_new (const gchar *signal_name,
return signal_id; return signal_id;
} }
#define __GTK_BINDINGS_C__
#include "gtkaliasdef.c"

5
gtk/gtkbox.c
View File

@ -25,9 +25,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkbox.h" #include "gtkbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
PROP_0, PROP_0,
@ -712,3 +712,6 @@ gtk_box_forall (GtkContainer *container,
(* callback) (child->widget, callback_data); (* callback) (child->widget, callback_data);
} }
} }
#define __GTK_BOX_C__
#include "gtkaliasdef.c"

5
gtk/gtkbutton.c
View File

@ -26,7 +26,6 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkalignment.h" #include "gtkalignment.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtklabel.h" #include "gtklabel.h"
@ -37,6 +36,7 @@
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define CHILD_SPACING 1 #define CHILD_SPACING 1
@ -1787,4 +1787,5 @@ gtk_button_get_image (GtkButton *button)
return priv->image; return priv->image;
} }
#define __GTK_BUTTON_C__
#include "gtkaliasdef.c"

9
gtk/gtkbutton.h
View File

@ -34,9 +34,7 @@
#include <gtk/gtkimage.h> #include <gtk/gtkimage.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_BUTTON (gtk_button_get_type ()) #define GTK_TYPE_BUTTON (gtk_button_get_type ())
#define GTK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton)) #define GTK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BUTTON, GtkButton))
@ -134,9 +132,6 @@ void _gtk_button_paint (GtkButton *button,
const gchar *main_detail, const gchar *main_detail,
const gchar *default_detail); const gchar *default_detail);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_BUTTON_H__ */ #endif /* __GTK_BUTTON_H__ */

5
gtk/gtkcalendar.c
View File

@ -42,7 +42,6 @@
#include <time.h> #include <time.h>
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include "gtkalias.h"
#include "gtkcalendar.h" #include "gtkcalendar.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -50,6 +49,7 @@
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
/***************************************************************************/ /***************************************************************************/
/* The following date routines are taken from the lib_date package. Keep /* The following date routines are taken from the lib_date package. Keep
@ -3553,3 +3553,6 @@ gtk_calendar_drag_data_received (GtkWidget *widget,
gtk_calendar_select_day (calendar, day); gtk_calendar_select_day (calendar, day);
g_object_thaw_notify (G_OBJECT (calendar)); g_object_thaw_notify (G_OBJECT (calendar));
} }
#define __GTK_CALENDAR_C__
#include "gtkaliasdef.c"

11
gtk/gtkcalendar.h
View File

@ -36,10 +36,7 @@
#include <gtk/gtksignal.h> #include <gtk/gtksignal.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CALENDAR (gtk_calendar_get_type ()) #define GTK_TYPE_CALENDAR (gtk_calendar_get_type ())
#define GTK_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar)) #define GTK_CALENDAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CALENDAR, GtkCalendar))
@ -148,10 +145,6 @@ void gtk_calendar_freeze (GtkCalendar *calendar);
void gtk_calendar_thaw (GtkCalendar *calendar); void gtk_calendar_thaw (GtkCalendar *calendar);
G_END_DECLS
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __GTK_CALENDAR_H__ */ #endif /* __GTK_CALENDAR_H__ */

5
gtk/gtkcelleditable.c
View File

@ -19,9 +19,9 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcelleditable.h" #include "gtkcelleditable.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
static void gtk_cell_editable_base_init (gpointer g_class); static void gtk_cell_editable_base_init (gpointer g_class);
@ -128,3 +128,6 @@ gtk_cell_editable_remove_widget (GtkCellEditable *cell_editable)
g_signal_emit_by_name (cell_editable, "remove_widget"); g_signal_emit_by_name (cell_editable, "remove_widget");
} }
#define __GTK_CELL_EDITABLE_C__
#include "gtkaliasdef.c"

5
gtk/gtkcelllayout.c
View File

@ -18,8 +18,8 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkalias.h"
GType GType
gtk_cell_layout_get_type (void) gtk_cell_layout_get_type (void)
@ -277,3 +277,6 @@ gtk_cell_layout_reorder (GtkCellLayout *cell_layout,
cell, cell,
position); position);
} }
#define __GTK_CELL_LAYOUT_C__
#include "gtkaliasdef.c"

4
gtk/gtkcellrenderer.c
View File

@ -18,11 +18,11 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcellrenderer.h" #include "gtkcellrenderer.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktreeprivate.h" #include "gtktreeprivate.h"
#include "gtkalias.h"
static void gtk_cell_renderer_init (GtkCellRenderer *cell); static void gtk_cell_renderer_init (GtkCellRenderer *cell);
static void gtk_cell_renderer_class_init (GtkCellRendererClass *class); static void gtk_cell_renderer_class_init (GtkCellRendererClass *class);
@ -808,3 +808,5 @@ gtk_cell_renderer_stop_editing (GtkCellRenderer *cell,
} }
} }
#define __GTK_CELL_RENDERER_C__
#include "gtkaliasdef.c"

5
gtk/gtkcellrenderercombo.c
View File

@ -20,7 +20,6 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbin.h" #include "gtkbin.h"
#include "gtkentry.h" #include "gtkentry.h"
@ -29,6 +28,7 @@
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkcombobox.h" #include "gtkcombobox.h"
#include "gtkcomboboxentry.h" #include "gtkcomboboxentry.h"
#include "gtkalias.h"
static void gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass); static void gtk_cell_renderer_combo_class_init (GtkCellRendererComboClass *klass);
static void gtk_cell_renderer_combo_init (GtkCellRendererCombo *self); static void gtk_cell_renderer_combo_init (GtkCellRendererCombo *self);
@ -392,3 +392,6 @@ gtk_cell_renderer_combo_start_editing (GtkCellRenderer *cell,
return GTK_CELL_EDITABLE (combo); return GTK_CELL_EDITABLE (combo);
} }
#define __GTK_CELL_RENDERER_COMBO_C__
#include "gtkaliasdef.c"

4
gtk/gtkcellrenderercombo.h
View File

@ -18,8 +18,8 @@
*/ */
#ifndef GTK_CELL_RENDERER_COMBO_H #ifndef __GTK_CELL_RENDERER_COMBO_H__
#define GTK_CELL_RENDERER_COMBO_H #define __GTK_CELL_RENDERER_COMBO_H__
#include <gtk/gtktreemodel.h> #include <gtk/gtktreemodel.h>
#include <gtk/gtkcellrenderertext.h> #include <gtk/gtkcellrenderertext.h>

5
gtk/gtkcellrendererpixbuf.c
View File

@ -19,10 +19,10 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
static void gtk_cell_renderer_pixbuf_get_property (GObject *object, static void gtk_cell_renderer_pixbuf_get_property (GObject *object,
guint param_id, guint param_id,
@ -609,3 +609,6 @@ gtk_cell_renderer_pixbuf_render (GtkCellRenderer *cell,
if (colorized) if (colorized)
g_object_unref (colorized); g_object_unref (colorized);
} }
#define __GTK_CELL_RENDERER_PIXBUF_C__
#include "gtkaliasdef.c"

4
gtk/gtkcellrendererprogress.c
View File

@ -28,9 +28,9 @@
#include "config.h" #include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrendererprogress.h" #include "gtkcellrendererprogress.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \ #define GTK_CELL_RENDERER_PROGRESS_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), \
GTK_TYPE_CELL_RENDERER_PROGRESS, \ GTK_TYPE_CELL_RENDERER_PROGRESS, \
@ -377,3 +377,5 @@ gtk_cell_renderer_progress_render (GtkCellRenderer *cell,
g_object_unref (gc); g_object_unref (gc);
} }
#define __GTK_CELL_RENDERER_PROGRESS_C__
#include "gtkaliasdef.c"

5
gtk/gtkcellrenderertext.c
View File

@ -19,13 +19,13 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkeditable.h" #include "gtkeditable.h"
#include "gtkentry.h" #include "gtkentry.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktreeprivate.h" #include "gtktreeprivate.h"
#include "gtkalias.h"
static void gtk_cell_renderer_text_init (GtkCellRendererText *celltext); static void gtk_cell_renderer_text_init (GtkCellRendererText *celltext);
static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class); static void gtk_cell_renderer_text_class_init (GtkCellRendererTextClass *class);
@ -1874,3 +1874,6 @@ gtk_cell_renderer_text_set_fixed_height_from_font (GtkCellRendererText *renderer
renderer->calc_fixed_height = TRUE; renderer->calc_fixed_height = TRUE;
} }
} }
#define __GTK_CELL_RENDERER_TEXT_C__
#include "gtkaliasdef.c"

5
gtk/gtkcellrenderertoggle.c
View File

@ -19,11 +19,11 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkcellrenderertoggle.h" #include "gtkcellrenderertoggle.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktreeprivate.h" #include "gtktreeprivate.h"
#include "gtkalias.h"
static void gtk_cell_renderer_toggle_get_property (GObject *object, static void gtk_cell_renderer_toggle_get_property (GObject *object,
guint param_id, guint param_id,
@ -481,3 +481,6 @@ gtk_cell_renderer_toggle_set_active (GtkCellRendererToggle *toggle,
g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL); g_object_set (toggle, "active", setting ? TRUE : FALSE, NULL);
} }
#define __GTK_CELL_RENDERER_TOGGLE_C__
#include "gtkaliasdef.c"

17
gtk/gtkcellview.c
View File

@ -18,7 +18,6 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcellview.h" #include "gtkcellview.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -26,6 +25,7 @@
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkcellrendererpixbuf.h" #include "gtkcellrendererpixbuf.h"
#include <gobject/gmarshal.h> #include <gobject/gmarshal.h>
#include "gtkalias.h"
typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo; typedef struct _GtkCellViewCellInfo GtkCellViewCellInfo;
struct _GtkCellViewCellInfo struct _GtkCellViewCellInfo
@ -967,6 +967,18 @@ gtk_cell_view_set_displayed_row (GtkCellView *cell_view,
gtk_widget_queue_draw (GTK_WIDGET (cell_view)); gtk_widget_queue_draw (GTK_WIDGET (cell_view));
} }
/**
* gtk_cell_view_get_displayed_row:
* @cell_view: a #GtkCellView
*
* Returns a #GtkTreePath referring to the currently
* displayed row. If no row is currently displayed,
* %NULL is returned.
*
* Returns: the currently displayed row or %NULL
*
* Since: 2.6
*/
GtkTreePath * GtkTreePath *
gtk_cell_view_get_displayed_row (GtkCellView *cell_view) gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
{ {
@ -1085,3 +1097,6 @@ gtk_cell_view_get_cell_renderers (GtkCellView *cell_view)
return g_list_reverse (retval); return g_list_reverse (retval);
} }
#define __GTK_CELL_VIEW_C__
#include "gtkaliasdef.c"

5
gtk/gtkcheckbutton.c
View File

@ -25,10 +25,10 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcheckbutton.h" #include "gtkcheckbutton.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkalias.h"
#define INDICATOR_SIZE 13 #define INDICATOR_SIZE 13
@ -451,3 +451,6 @@ gtk_real_check_button_draw_indicator (GtkCheckButton *check_button,
x, y, indicator_size, indicator_size); x, y, indicator_size, indicator_size);
} }
} }
#define __GTK_CHECK_BUTTON_C__
#include "gtkaliasdef.c"

10
gtk/gtkcheckbutton.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtktogglebutton.h> #include <gtk/gtktogglebutton.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CHECK_BUTTON (gtk_check_button_get_type ()) #define GTK_TYPE_CHECK_BUTTON (gtk_check_button_get_type ())
#define GTK_CHECK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton)) #define GTK_CHECK_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_BUTTON, GtkCheckButton))
@ -77,9 +74,6 @@ void _gtk_check_button_get_props (GtkCheckButton *check_button,
gint *indicator_size, gint *indicator_size,
gint *indicator_spacing); gint *indicator_spacing);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CHECK_BUTTON_H__ */ #endif /* __GTK_CHECK_BUTTON_H__ */

5
gtk/gtkcheckmenuitem.c
View File

@ -25,11 +25,11 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcheckmenuitem.h" #include "gtkcheckmenuitem.h"
#include "gtkaccellabel.h" #include "gtkaccellabel.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
enum { enum {
TOGGLED, TOGGLED,
@ -541,3 +541,6 @@ gtk_check_menu_item_set_property (GObject *object,
break; break;
} }
} }
#define __GTK_CHECK_MENU_ITEM_C__
#include "gtkaliasdef.c"

14
gtk/gtkcheckmenuitem.h
View File

@ -24,18 +24,15 @@
* GTK+ at ftp://ftp.gtk.org/pub/gtk/. * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/ */
#ifndef __GTK_MENU_CHECK_ITEM_H__ #ifndef __GTK_CHECK_MENU_ITEM_H__
#define __GTK_MENU_CHECK_ITEM_H__ #define __GTK_CHECK_MENU_ITEM_H__
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkmenuitem.h> #include <gtk/gtkmenuitem.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ()) #define GTK_TYPE_CHECK_MENU_ITEM (gtk_check_menu_item_get_type ())
#define GTK_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem)) #define GTK_CHECK_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM, GtkCheckMenuItem))
@ -97,9 +94,6 @@ void gtk_check_menu_item_set_show_toggle (GtkCheckMenuItem *menu_item,
#define gtk_check_menu_item_set_state gtk_check_menu_item_set_active #define gtk_check_menu_item_set_state gtk_check_menu_item_set_active
#endif #endif
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CHECK_MENU_ITEM_H__ */ #endif /* __GTK_CHECK_MENU_ITEM_H__ */

5
gtk/gtkclipboard.c
View File

@ -23,11 +23,11 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkclipboard.h" #include "gtkclipboard.h"
#include "gtkinvisible.h" #include "gtkinvisible.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
#ifdef GDK_WINDOWING_X11 #ifdef GDK_WINDOWING_X11
#include "x11/gdkx.h" #include "x11/gdkx.h"
@ -1731,3 +1731,6 @@ _gtk_clipboard_store_all (void)
g_slist_free (displays); g_slist_free (displays);
} }
#define __GTK_CLIPBOARD_C__
#include "gtkaliasdef.c"

10
gtk/gtkclipboard.h
View File

@ -22,12 +22,10 @@
#ifndef __GTK_CLIPBOARD_H__ #ifndef __GTK_CLIPBOARD_H__
#define __GTK_CLIPBOARD_H__ #define __GTK_CLIPBOARD_H__
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#include <gtk/gtkselection.h> #include <gtk/gtkselection.h>
G_BEGIN_DECLS
#define GTK_TYPE_CLIPBOARD (gtk_clipboard_get_type ()) #define GTK_TYPE_CLIPBOARD (gtk_clipboard_get_type ())
#define GTK_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard)) #define GTK_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CLIPBOARD, GtkClipboard))
#define GTK_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD)) #define GTK_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CLIPBOARD))
@ -127,8 +125,6 @@ void _gtk_clipboard_handle_event (GdkEventOwnerChange *event);
void _gtk_clipboard_store_all (void); void _gtk_clipboard_store_all (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CLIPBOARD_H__ */ #endif /* __GTK_CLIPBOARD_H__ */

7
gtk/gtkclist.c
View File

@ -33,13 +33,14 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkobject.h"
#include "gtkclist.h" #include "gtkclist.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtkalias.h"
/* length of button_actions array */ /* length of button_actions array */
#define MAX_BUTTON 5 #define MAX_BUTTON 5
@ -7825,3 +7826,7 @@ gtk_clist_set_button_actions (GtkCList *clist,
clist->button_actions[button] = button_actions; clist->button_actions[button] = button_actions;
} }
} }
#define __GTK_CLIST_C__
#include "gtkaliasdef.c"

5
gtk/gtkcolorbutton.c
View File

@ -30,7 +30,6 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcolorbutton.h" #include "gtkcolorbutton.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gdk-pixbuf/gdk-pixbuf.h" #include "gdk-pixbuf/gdk-pixbuf.h"
@ -45,6 +44,7 @@
#include "gtksignal.h" #include "gtksignal.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
/* Size of checks and gray levels for alpha compositing checkerboard */ /* Size of checks and gray levels for alpha compositing checkerboard */
#define CHECK_SIZE 4 #define CHECK_SIZE 4
@ -1009,3 +1009,6 @@ gtk_color_button_get_property (GObject *object,
break; break;
} }
} }
#define __GTK_COLOR_BUTTON_C__
#include "gtkaliasdef.c"

6
gtk/gtkcolorsel.c
View File

@ -29,7 +29,6 @@
#include "gdkconfig.h" #include "gdkconfig.h"
#include <math.h> #include <math.h>
#include "gtkalias.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkcolorsel.h" #include "gtkcolorsel.h"
#include "gtkhsv.h" #include "gtkhsv.h"
@ -60,6 +59,7 @@
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkalias.h"
#include <string.h> #include <string.h>
@ -2865,3 +2865,7 @@ make_all_relations (AtkObject *atk_obj,
make_control_relations (atk_obj, priv->green_spinbutton); make_control_relations (atk_obj, priv->green_spinbutton);
make_control_relations (atk_obj, priv->blue_spinbutton); make_control_relations (atk_obj, priv->blue_spinbutton);
} }
#define __GTK_COLOR_SELECTION_C__
#include "gtkaliasdef.c"

10
gtk/gtkcolorsel.h
View File

@ -30,10 +30,7 @@
#include <gtk/gtkdialog.h> #include <gtk/gtkdialog.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_COLOR_SELECTION (gtk_color_selection_get_type ()) #define GTK_TYPE_COLOR_SELECTION (gtk_color_selection_get_type ())
#define GTK_COLOR_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection)) #define GTK_COLOR_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION, GtkColorSelection))
@ -128,9 +125,6 @@ void gtk_color_selection_set_update_policy (GtkColorSelection *colorsel,
GtkUpdateType policy); GtkUpdateType policy);
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_COLOR_SELECTION_H__ */ #endif /* __GTK_COLOR_SELECTION_H__ */

4
gtk/gtkcolorseldialog.c
View File

@ -25,13 +25,13 @@
*/ */
#include <config.h> #include <config.h>
#include <glib.h> #include <glib.h>
#include "gtkalias.h"
#include "gtkcolorseldialog.h" #include "gtkcolorseldialog.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtkhbbox.h" #include "gtkhbbox.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
static void gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass); static void gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass);
@ -138,3 +138,5 @@ gtk_color_selection_dialog_new (const gchar *title)
return GTK_WIDGET (colorseldiag); return GTK_WIDGET (colorseldiag);
} }
#define __GTK_COLOR_SELECTION_DIALOG_C__
#include "gtkaliasdef.c"

9
gtk/gtkcolorseldialog.h
View File

@ -30,9 +30,7 @@
#include <gtk/gtkcolorsel.h> #include <gtk/gtkcolorsel.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_COLOR_SELECTION_DIALOG (gtk_color_selection_dialog_get_type ()) #define GTK_TYPE_COLOR_SELECTION_DIALOG (gtk_color_selection_dialog_get_type ())
#define GTK_COLOR_SELECTION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog)) #define GTK_COLOR_SELECTION_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COLOR_SELECTION_DIALOG, GtkColorSelectionDialog))
@ -73,9 +71,6 @@ GType gtk_color_selection_dialog_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_color_selection_dialog_new (const gchar *title); GtkWidget* gtk_color_selection_dialog_new (const gchar *title);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */ #endif /* __GTK_COLOR_SELECTION_DIALOG_H__ */

5
gtk/gtkcombo.c
View File

@ -33,7 +33,6 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkarrow.h" #include "gtkarrow.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtklist.h" #include "gtklist.h"
@ -48,6 +47,7 @@
#include "gtkcombo.h" #include "gtkcombo.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
const gchar gtk_combo_string_key[] = "gtk-combo-string-value"; const gchar gtk_combo_string_key[] = "gtk-combo-string-value";
@ -1254,3 +1254,6 @@ gtk_combo_get_property (GObject *object,
} }
} }
#define __GTK_SMART_COMBO_C__
#include "gtkaliasdef.c"

8
gtk/gtkcombo.h
View File

@ -32,9 +32,7 @@
#include <gtk/gtkhbox.h> #include <gtk/gtkhbox.h>
#include <gtk/gtkitem.h> #include <gtk/gtkitem.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_COMBO (gtk_combo_get_type ()) #define GTK_TYPE_COMBO (gtk_combo_get_type ())
#define GTK_COMBO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo)) #define GTK_COMBO(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_COMBO, GtkCombo))
@ -113,9 +111,7 @@ void gtk_combo_set_popdown_strings (GtkCombo* combo,
void gtk_combo_disable_activate (GtkCombo* combo); void gtk_combo_disable_activate (GtkCombo* combo);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_SMART_COMBO_H__ */ #endif /* __GTK_SMART_COMBO_H__ */

5
gtk/gtkcombobox.c
View File

@ -18,7 +18,6 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcombobox.h" #include "gtkcombobox.h"
#include "gtkarrow.h" #include "gtkarrow.h"
@ -51,6 +50,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktreeprivate.h" #include "gtktreeprivate.h"
#include "gtkalias.h"
/* WELCOME, to THE house of evil code */ /* WELCOME, to THE house of evil code */
@ -5140,3 +5140,6 @@ gtk_combo_box_get_focus_on_click (GtkComboBox *combo)
return combo->priv->focus_on_click; return combo->priv->focus_on_click;
} }
#define __GTK_COMBO_BOX_C__
#include "gtkaliasdef.c"

5
gtk/gtkcomboboxentry.c
View File

@ -18,7 +18,6 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkcomboboxentry.h" #include "gtkcomboboxentry.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
@ -26,6 +25,7 @@
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate)) #define GTK_COMBO_BOX_ENTRY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_COMBO_BOX_ENTRY, GtkComboBoxEntryPrivate))
@ -382,3 +382,6 @@ gtk_combo_box_entry_new_text (void)
return entry_box; return entry_box;
} }
#define __GTK_COMBO_BOX_ENTRY_C__
#include "gtkaliasdef.c"

5
gtk/gtkcontainer.c
View File

@ -29,7 +29,6 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkcontainer.h" #include "gtkcontainer.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkmain.h" #include "gtkmain.h"
@ -39,6 +38,7 @@
#include "gtktoolbar.h" #include "gtktoolbar.h"
#include <gobject/gobjectnotifyqueue.c> #include <gobject/gobjectnotifyqueue.c>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#include "gtkalias.h"
enum { enum {
@ -2463,3 +2463,6 @@ gtk_container_propagate_expose (GtkContainer *container,
gdk_event_free (child_event); gdk_event_free (child_event);
} }
} }
#define __GTK_CONTAINER_C__
#include "gtkaliasdef.c"

10
gtk/gtkcontainer.h
View File

@ -34,10 +34,7 @@
#include <gtk/gtkadjustment.h> #include <gtk/gtkadjustment.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CONTAINER (gtk_container_get_type ()) #define GTK_TYPE_CONTAINER (gtk_container_get_type ())
#define GTK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer)) #define GTK_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER, GtkContainer))
@ -223,9 +220,6 @@ GList *_gtk_container_focus_sort (GtkContainer *container,
#define gtk_container_border_width gtk_container_set_border_width #define gtk_container_border_width gtk_container_set_border_width
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CONTAINER_H__ */ #endif /* __GTK_CONTAINER_H__ */

5
gtk/gtkctree.c
View File

@ -33,13 +33,13 @@
#include <config.h> #include <config.h>
#include <stdlib.h> #include <stdlib.h>
#include "gtkalias.h"
#include "gtkctree.h" #include "gtkctree.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkdnd.h" #include "gtkdnd.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtkalias.h"
#define PM_SIZE 8 #define PM_SIZE 8
#define TAB_SIZE (PM_SIZE + 6) #define TAB_SIZE (PM_SIZE + 6)
@ -6119,3 +6119,6 @@ gtk_ctree_node_get_type (void)
return our_type; return our_type;
} }
#define __GTK_CTREE_C__
#include "gtkaliasdef.c"

8
gtk/gtkctree.h
View File

@ -35,9 +35,7 @@
#include <gtk/gtkclist.h> #include <gtk/gtkclist.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CTREE (gtk_ctree_get_type ()) #define GTK_TYPE_CTREE (gtk_ctree_get_type ())
#define GTK_CTREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree)) #define GTK_CTREE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_CTREE, GtkCTree))
@ -440,9 +438,7 @@ void gtk_ctree_sort_recursive (GtkCTree *ctree,
*/ */
GType gtk_ctree_node_get_type (void) G_GNUC_CONST; GType gtk_ctree_node_get_type (void) G_GNUC_CONST;
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CTREE_H__ */ #endif /* __GTK_CTREE_H__ */

5
gtk/gtkcurve.c
View File

@ -29,7 +29,6 @@
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#include "gtkalias.h"
#include "gtkcurve.h" #include "gtkcurve.h"
#include "gtkdrawingarea.h" #include "gtkdrawingarea.h"
#include "gtkmain.h" #include "gtkmain.h"
@ -37,6 +36,7 @@
#include "gtkradiobutton.h" #include "gtkradiobutton.h"
#include "gtktable.h" #include "gtktable.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define RADIUS 3 /* radius of the control points */ #define RADIUS 3 /* radius of the control points */
#define MIN_DISTANCE 8 /* min distance between control points */ #define MIN_DISTANCE 8 /* min distance between control points */
@ -1044,3 +1044,6 @@ gtk_curve_finalize (GObject *object)
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
#define __GTK_CURVE_C__
#include "gtkaliasdef.c"

10
gtk/gtkcurve.h
View File

@ -41,10 +41,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkdrawingarea.h> #include <gtk/gtkdrawingarea.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_CURVE (gtk_curve_get_type ()) #define GTK_TYPE_CURVE (gtk_curve_get_type ())
#define GTK_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve)) #define GTK_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CURVE, GtkCurve))
@ -110,9 +107,6 @@ void gtk_curve_set_vector (GtkCurve *curve,
void gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type); void gtk_curve_set_curve_type (GtkCurve *curve, GtkCurveType type);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_CURVE_H__ */ #endif /* __GTK_CURVE_H__ */

4
gtk/gtkdialog.c
View File

@ -25,7 +25,6 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkdialog.h" #include "gtkdialog.h"
#include "gtkhbbox.h" #include "gtkhbbox.h"
@ -37,6 +36,7 @@
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkalias.h"
#define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate)) #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_DIALOG, GtkDialogPrivate))
@ -1237,3 +1237,5 @@ gtk_dialog_set_alternative_button_order_from_array (GtkDialog *dialog,
} }
} }
#define __GTK_DIALOG_C__
#include "gtkaliasdef.c"

9
gtk/gtkdialog.h
View File

@ -32,9 +32,7 @@
#include <gtk/gtkwindow.h> #include <gtk/gtkwindow.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/* Parameters for dialog construction */ /* Parameters for dialog construction */
typedef enum typedef enum
@ -174,9 +172,6 @@ void _gtk_dialog_set_ignore_separator (GtkDialog *dialog,
gint _gtk_dialog_get_response_for_widget (GtkDialog *dialog, gint _gtk_dialog_get_response_for_widget (GtkDialog *dialog,
GtkWidget *widget); GtkWidget *widget);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_DIALOG_H__ */ #endif /* __GTK_DIALOG_H__ */

5
gtk/gtkdnd.c
View File

@ -25,7 +25,6 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gdkconfig.h" #include "gdkconfig.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
@ -37,6 +36,7 @@
#include "gtkplug.h" #include "gtkplug.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkalias.h"
static GSList *source_widgets = NULL; static GSList *source_widgets = NULL;
@ -3699,3 +3699,6 @@ gtk_drag_check_threshold (GtkWidget *widget,
return (ABS (current_x - start_x) > drag_threshold || return (ABS (current_x - start_x) > drag_threshold ||
ABS (current_y - start_y) > drag_threshold); ABS (current_y - start_y) > drag_threshold);
} }
#define __GTK_DND_C__
#include "gtkaliasdef.c"

8
gtk/gtkdnd.h
View File

@ -32,9 +32,7 @@
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#include <gtk/gtkselection.h> #include <gtk/gtkselection.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
typedef enum { typedef enum {
GTK_DEST_DEFAULT_MOTION = 1 << 0, /* respond to "drag_motion" */ GTK_DEST_DEFAULT_MOTION = 1 << 0, /* respond to "drag_motion" */
@ -168,9 +166,7 @@ void gtk_drag_set_default_icon (GdkColormap *colormap,
gint hot_y); gint hot_y);
#endif /* !GTK_DISABLE_DEPRECATED */ #endif /* !GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_DND_H__ */ #endif /* __GTK_DND_H__ */

5
gtk/gtkdrawingarea.c
View File

@ -25,8 +25,8 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkdrawingarea.h" #include "gtkdrawingarea.h"
#include "gtkalias.h"
static void gtk_drawing_area_class_init (GtkDrawingAreaClass *klass); static void gtk_drawing_area_class_init (GtkDrawingAreaClass *klass);
@ -170,3 +170,6 @@ gtk_drawing_area_send_configure (GtkDrawingArea *darea)
gtk_widget_event (widget, event); gtk_widget_event (widget, event);
gdk_event_free (event); gdk_event_free (event);
} }
#define __GTK_DRAWING_AREA_C__
#include "gtkaliasdef.c"

10
gtk/gtkdrawingarea.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_DRAWING_AREA (gtk_drawing_area_get_type ()) #define GTK_TYPE_DRAWING_AREA (gtk_drawing_area_get_type ())
#define GTK_DRAWING_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea)) #define GTK_DRAWING_AREA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_DRAWING_AREA, GtkDrawingArea))
@ -77,9 +74,6 @@ void gtk_drawing_area_size (GtkDrawingArea *darea,
#endif /* GTK_DISABLE_DEPRECATED */ #endif /* GTK_DISABLE_DEPRECATED */
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_DRAWING_AREA_H__ */ #endif /* __GTK_DRAWING_AREA_H__ */

5
gtk/gtkeditable.c
View File

@ -27,9 +27,9 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkeditable.h" #include "gtkeditable.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
static void gtk_editable_base_init (gpointer g_class); static void gtk_editable_base_init (gpointer g_class);
@ -242,3 +242,6 @@ gtk_editable_get_editable (GtkEditable *editable)
return value; return value;
} }
#define __GTK_EDITABLE_C__
#include "gtkaliasdef.c"

10
gtk/gtkeditable.h
View File

@ -31,10 +31,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#include <gtk/gtkwidget.h> #include <gtk/gtkwidget.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_EDITABLE (gtk_editable_get_type ()) #define GTK_TYPE_EDITABLE (gtk_editable_get_type ())
#define GTK_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable)) #define GTK_EDITABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EDITABLE, GtkEditable))
@ -111,9 +108,6 @@ void gtk_editable_set_editable (GtkEditable *editable,
gboolean is_editable); gboolean is_editable);
gboolean gtk_editable_get_editable (GtkEditable *editable); gboolean gtk_editable_get_editable (GtkEditable *editable);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_EDITABLE_H__ */ #endif /* __GTK_EDITABLE_H__ */

5
gtk/gtkentry.c
View File

@ -30,7 +30,6 @@
#include <pango/pango.h> #include <pango/pango.h>
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkcelleditable.h" #include "gtkcelleditable.h"
#include "gtkclipboard.h" #include "gtkclipboard.h"
@ -53,6 +52,7 @@
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkalias.h"
#define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key" #define GTK_ENTRY_COMPLETION_KEY "gtk-entry-completion-key"
@ -5390,3 +5390,6 @@ gtk_entry_get_completion (GtkEntry *entry)
return completion; return completion;
} }
#define __GTK_ENTRY_C__
#include "gtkaliasdef.c"

10
gtk/gtkentry.h
View File

@ -35,10 +35,7 @@
#include <gtk/gtkentrycompletion.h> #include <gtk/gtkentrycompletion.h>
#include <pango/pango.h> #include <pango/pango.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_ENTRY (gtk_entry_get_type ()) #define GTK_TYPE_ENTRY (gtk_entry_get_type ())
#define GTK_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry)) #define GTK_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ENTRY, GtkEntry))
@ -221,9 +218,6 @@ void _gtk_entry_get_borders (GtkEntry *entry,
gint *yborder); gint *yborder);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_ENTRY_H__ */ #endif /* __GTK_ENTRY_H__ */

5
gtk/gtkentrycompletion.c
View File

@ -18,10 +18,10 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkentrycompletion.h" #include "gtkentrycompletion.h"
#include "gtkentryprivate.h" #include "gtkentryprivate.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkalias.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
@ -1607,3 +1607,6 @@ gtk_entry_completion_get_popup_completion (GtkEntryCompletion *completion)
return completion->priv->popup_completion; return completion->priv->popup_completion;
} }
#define __GTK_ENTRY_COMPLETION_C__
#include "gtkaliasdef.c"

4
gtk/gtkeventbox.c
View File

@ -25,9 +25,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkeventbox.h" #include "gtkeventbox.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
typedef struct typedef struct
{ {
@ -610,3 +610,5 @@ gtk_event_box_expose (GtkWidget *widget,
return FALSE; return FALSE;
} }
#define __GTK_EVENT_BOX_C__
#include "gtkaliasdef.c"

10
gtk/gtkeventbox.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtkbin.h> #include <gtk/gtkbin.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_EVENT_BOX (gtk_event_box_get_type ()) #define GTK_TYPE_EVENT_BOX (gtk_event_box_get_type ())
#define GTK_EVENT_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox)) #define GTK_EVENT_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_EVENT_BOX, GtkEventBox))
@ -66,9 +63,6 @@ gboolean gtk_event_box_get_above_child (GtkEventBox *event_box);
void gtk_event_box_set_above_child (GtkEventBox *event_box, void gtk_event_box_set_above_child (GtkEventBox *event_box,
gboolean above_child); gboolean above_child);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_EVENT_BOX_H__ */ #endif /* __GTK_EVENT_BOX_H__ */

5
gtk/gtkexpander.c
View File

@ -23,7 +23,6 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkexpander.h" #include "gtkexpander.h"
#include "gtklabel.h" #include "gtklabel.h"
@ -33,6 +32,7 @@
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtkalias.h"
#define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate)) #define GTK_EXPANDER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_EXPANDER, GtkExpanderPrivate))
@ -1640,3 +1640,6 @@ gtk_expander_get_label_widget (GtkExpander *expander)
return expander->priv->label_widget; return expander->priv->label_widget;
} }
#define __GTK_EXPANDER_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilechooser.c
View File

@ -19,12 +19,12 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilechooser.h" #include "gtkfilechooser.h"
#include "gtkfilechooserprivate.h" #include "gtkfilechooserprivate.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkalias.h"
static void gtk_file_chooser_class_init (gpointer g_iface); static void gtk_file_chooser_class_init (gpointer g_iface);
@ -1999,3 +1999,6 @@ gtk_file_chooser_list_shortcut_folders (GtkFileChooser *chooser)
} }
#endif #endif
#define __GTK_FILE_CHOOSER_C__
#include "gtkaliasdef.c"

6
gtk/gtkfilechooserbutton.c
View File

@ -30,7 +30,6 @@
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
@ -56,6 +55,8 @@
#include "gtkfilesystemwin32.h" #include "gtkfilesystemwin32.h"
#endif #endif
#include "gtkalias.h"
/* **************** * /* **************** *
* Private Macros * * Private Macros *
* **************** */ * **************** */
@ -2339,3 +2340,6 @@ gtk_file_chooser_button_set_width_chars (GtkFileChooserButton *button,
gtk_label_set_width_chars (GTK_LABEL (button->priv->label), n_chars); gtk_label_set_width_chars (GTK_LABEL (button->priv->label), n_chars);
g_object_notify (G_OBJECT (button), "width-chars"); g_object_notify (G_OBJECT (button), "width-chars");
} }
#define __GTK_FILE_CHOOSER_BUTTON_C__
#include "gtkaliasdef.c"

6
gtk/gtkfilechooserdefault.c
View File

@ -20,7 +20,6 @@
#include <config.h> #include <config.h>
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkalignment.h" #include "gtkalignment.h"
#include "gtkbindings.h" #include "gtkbindings.h"
#include "gtkbutton.h" #include "gtkbutton.h"
@ -74,6 +73,8 @@
#include "gtkfilesystemwin32.h" #include "gtkfilesystemwin32.h"
#endif #endif
#include "gtkalias.h"
#include <errno.h> #include <errno.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
@ -6501,3 +6502,6 @@ shortcuts_model_filter_new (GtkFileChooserDefault *impl,
return GTK_TREE_MODEL (model); return GTK_TREE_MODEL (model);
} }
#define __GTK_FILE_CHOOSER_DEFAULT_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilechooserdialog.c
View File

@ -19,13 +19,13 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserdialog.h" #include "gtkfilechooserdialog.h"
#include "gtkfilechooserwidget.h" #include "gtkfilechooserwidget.h"
#include "gtkfilechooserutils.h" #include "gtkfilechooserutils.h"
#include "gtkfilechooserembed.h" #include "gtkfilechooserembed.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkalias.h"
#include <stdarg.h> #include <stdarg.h>
@ -667,3 +667,6 @@ gtk_file_chooser_dialog_new_with_backend (const gchar *title,
return result; return result;
} }
#define __GTK_FILE_CHOOSER_DIALOG_C__
#include "gtkaliasdef.c"

4
gtk/gtkfilechooserembed.c
View File

@ -1,7 +1,7 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserembed.h" #include "gtkfilechooserembed.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkalias.h"
static void gtk_file_chooser_embed_class_init (gpointer g_iface); static void gtk_file_chooser_embed_class_init (gpointer g_iface);
static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed, static void delegate_get_default_size (GtkFileChooserEmbed *chooser_embed,
@ -181,3 +181,5 @@ _gtk_file_chooser_embed_get_resizable_hints (GtkFileChooserEmbed *chooser_embed,
GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically); GTK_FILE_CHOOSER_EMBED_GET_IFACE (chooser_embed)->get_resizable_hints (chooser_embed, resize_horizontally, resize_vertically);
} }
#define __GTK_FILE_CHOOSER_EMBED_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilechooserentry.c
View File

@ -21,12 +21,12 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkcelllayout.h" #include "gtkcelllayout.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkentry.h" #include "gtkentry.h"
#include "gtkfilechooserentry.h" #include "gtkfilechooserentry.h"
#include "gtkmain.h" #include "gtkmain.h"
#include "gtkalias.h"
typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass; typedef struct _GtkFileChooserEntryClass GtkFileChooserEntryClass;
@ -991,3 +991,6 @@ _gtk_file_chooser_entry_get_action (GtkFileChooserEntry *chooser_entry)
return chooser_entry->action; return chooser_entry->action;
} }
#define __GTK_FILE_CHOOSER_ENTRY_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilechooserutils.c
View File

@ -20,11 +20,11 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserutils.h" #include "gtkfilechooserutils.h"
#include "gtkfilechooser.h" #include "gtkfilechooser.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkalias.h"
static gboolean delegate_set_current_folder (GtkFileChooser *chooser, static gboolean delegate_set_current_folder (GtkFileChooser *chooser,
const GtkFilePath *path, const GtkFilePath *path,
@ -341,3 +341,6 @@ delegate_file_activated (GtkFileChooser *chooser,
{ {
g_signal_emit_by_name (data, "file-activated"); g_signal_emit_by_name (data, "file-activated");
} }
#define __GTK_FILE_CHOOSER_UTILS_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilechooserwidget.c
View File

@ -19,12 +19,12 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilechooserwidget.h" #include "gtkfilechooserwidget.h"
#include "gtkfilechooserdefault.h" #include "gtkfilechooserdefault.h"
#include "gtkfilechooserutils.h" #include "gtkfilechooserutils.h"
#include "gtktypebuiltins.h" #include "gtktypebuiltins.h"
#include "gtkfilechooserembed.h" #include "gtkfilechooserembed.h"
#include "gtkalias.h"
struct _GtkFileChooserWidgetPrivate struct _GtkFileChooserWidgetPrivate
{ {
@ -248,3 +248,6 @@ gtk_file_chooser_widget_new_with_backend (GtkFileChooserAction action,
"file-system-backend", backend, "file-system-backend", backend,
NULL); NULL);
} }
#define __GTK_FILE_CHOOSER_WIDGET_C__
#include "gtkaliasdef.c"

6
gtk/gtkfilefilter.c
View File

@ -21,11 +21,12 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkfilefilter.h" #include "gtkfilefilter.h"
#include "gtkobject.h" #include "gtkobject.h"
#include "gtkprivate.h" #include "gtkprivate.h"
#include "gtkalias.h"
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
#define XDG_PREFIX _gtk_xdg #define XDG_PREFIX _gtk_xdg
#include "xdgmime/xdgmime.h" #include "xdgmime/xdgmime.h"
@ -453,3 +454,6 @@ gtk_file_filter_filter (GtkFileFilter *filter,
return FALSE; return FALSE;
} }
#define __GTK_FILE_FILTER_C__
#include "gtkaliasdef.c"

6
gtk/gtkfilesel.c
View File

@ -56,7 +56,6 @@
#endif #endif
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkbutton.h" #include "gtkbutton.h"
#include "gtkcellrenderertext.h" #include "gtkcellrenderertext.h"
#include "gtkentry.h" #include "gtkentry.h"
@ -87,6 +86,8 @@
#define WANT_HPANED 1 #define WANT_HPANED 1
#include "gtkhpaned.h" #include "gtkhpaned.h"
#include "gtkalias.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <direct.h> #include <direct.h>
#include <io.h> #include <io.h>
@ -4091,3 +4092,6 @@ gtk_file_selection_get_selections (GtkFileSelection *filesel)
} }
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
#define __GTK_FILESEL_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilesystem.c
View File

@ -20,10 +20,10 @@
#include <config.h> #include <config.h>
#include <gmodule.h> #include <gmodule.h>
#include "gtkalias.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkmodules.h" #include "gtkmodules.h"
#include "gtkalias.h"
#include <string.h> #include <string.h>
@ -1147,4 +1147,5 @@ _gtk_file_system_create (const char *file_system_name)
return fs; return fs;
} }
#define __GTK_FILE_SYSTEM_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilesystemmodel.c
View File

@ -21,13 +21,13 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkfilesystemmodel.h" #include "gtkfilesystemmodel.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtktreednd.h" #include "gtktreednd.h"
#include "gtktreemodel.h" #include "gtktreemodel.h"
#include "gtkalias.h"
typedef struct _GtkFileSystemModelClass GtkFileSystemModelClass; typedef struct _GtkFileSystemModelClass GtkFileSystemModelClass;
typedef struct _FileModelNode FileModelNode; typedef struct _FileModelNode FileModelNode;
@ -1869,3 +1869,6 @@ root_files_removed_callback (GtkFileFolder *folder,
{ {
do_files_removed (model, NULL, paths); do_files_removed (model, NULL, paths);
} }
#define __GTK_FILE_SYSTEM_MODEL_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilesystemunix.c
View File

@ -20,12 +20,12 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkfilesystemunix.h" #include "gtkfilesystemunix.h"
#include "gtkicontheme.h" #include "gtkicontheme.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkalias.h"
#define XDG_PREFIX _gtk_xdg #define XDG_PREFIX _gtk_xdg
#include "xdgmime/xdgmime.h" #include "xdgmime/xdgmime.h"
@ -2062,3 +2062,6 @@ filename_is_root (const char *filename)
return (after_root != NULL && *after_root == '\0'); return (after_root != NULL && *after_root == '\0');
} }
#define __GTK_FILE_SYSTEM_UNIX_C__
#include "gtkaliasdef.c"

5
gtk/gtkfilesystemwin32.c
View File

@ -20,12 +20,12 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfilesystem.h" #include "gtkfilesystem.h"
#include "gtkfilesystemwin32.h" #include "gtkfilesystemwin32.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkstock.h" #include "gtkstock.h"
#include "gtkiconfactory.h" #include "gtkiconfactory.h"
#include "gtkalias.h"
#include <glib/gstdio.h> #include <glib/gstdio.h>
@ -1711,3 +1711,6 @@ _gtk_file_system_win32_path_compare (const gchar *path1,
return retval; return retval;
} }
#define __GTK_FILE_SYSTEM_WIN32_C__
#include "gtkaliasdef.c"

5
gtk/gtkfixed.c
View File

@ -25,9 +25,9 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfixed.h" #include "gtkfixed.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
enum { enum {
CHILD_PROP_0, CHILD_PROP_0,
@ -532,3 +532,6 @@ gtk_fixed_get_has_window (GtkFixed *fixed)
return !GTK_WIDGET_NO_WINDOW (fixed); return !GTK_WIDGET_NO_WINDOW (fixed);
} }
#define __GTK_FIXED_C__
#include "gtkaliasdef.c"

10
gtk/gtkfixed.h
View File

@ -32,10 +32,7 @@
#include <gtk/gtkcontainer.h> #include <gtk/gtkcontainer.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_FIXED (gtk_fixed_get_type ()) #define GTK_TYPE_FIXED (gtk_fixed_get_type ())
#define GTK_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed)) #define GTK_FIXED(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FIXED, GtkFixed))
@ -83,9 +80,6 @@ void gtk_fixed_set_has_window (GtkFixed *fixed,
gboolean has_window); gboolean has_window);
gboolean gtk_fixed_get_has_window (GtkFixed *fixed); gboolean gtk_fixed_get_has_window (GtkFixed *fixed);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_FIXED_H__ */ #endif /* __GTK_FIXED_H__ */

11
gtk/gtkfontbutton.c
View File

@ -28,7 +28,6 @@
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkfontbutton.h" #include "gtkfontbutton.h"
#include "gtksignal.h" #include "gtksignal.h"
@ -41,6 +40,7 @@
#include "gtkimage.h" #include "gtkimage.h"
#include "gtkmarshalers.h" #include "gtkmarshalers.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -936,10 +936,5 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
pango_font_description_free (desc); pango_font_description_free (desc);
} }
#define __GTK_FONT_BUTTON_C__
#include "gtkaliasdef.c"

5
gtk/gtkfontsel.c
View File

@ -39,7 +39,6 @@
#include "gdk/gdk.h" #include "gdk/gdk.h"
#include "gdk/gdkkeysyms.h" #include "gdk/gdkkeysyms.h"
#include "gtkalias.h"
#include "gtkfontsel.h" #include "gtkfontsel.h"
#include "gtkbutton.h" #include "gtkbutton.h"
@ -59,6 +58,7 @@
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkalias.h"
/* We don't enable the font and style entries because they don't add /* We don't enable the font and style entries because they don't add
* much in terms of visible effect and have a weird effect on keynav. * much in terms of visible effect and have a weird effect on keynav.
@ -1430,3 +1430,6 @@ gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
{ {
gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text); gtk_font_selection_set_preview_text (GTK_FONT_SELECTION (fsd->fontsel), text);
} }
#define __GTK_FONTSEL_C__
#include "gtkaliasdef.c"

8
gtk/gtkfontsel.h
View File

@ -36,9 +36,7 @@
#include <gtk/gtkdialog.h> #include <gtk/gtkdialog.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ()) #define GTK_TYPE_FONT_SELECTION (gtk_font_selection_get_type ())
#define GTK_FONT_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection)) #define GTK_FONT_SELECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_FONT_SELECTION, GtkFontSelection))
@ -194,9 +192,7 @@ void gtk_font_selection_dialog_set_preview_text (GtkFontSelectionDialog *fsd,
const gchar *text); const gchar *text);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_FONTSEL_H__ */ #endif /* __GTK_FONTSEL_H__ */

5
gtk/gtkframe.c
View File

@ -26,10 +26,10 @@
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include "gtkalias.h"
#include "gtkframe.h" #include "gtkframe.h"
#include "gtklabel.h" #include "gtklabel.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
#define LABEL_PAD 1 #define LABEL_PAD 1
#define LABEL_SIDE_PAD 2 #define LABEL_SIDE_PAD 2
@ -720,3 +720,6 @@ gtk_frame_real_compute_child_allocation (GtkFrame *frame,
child_allocation->x += allocation->x; child_allocation->x += allocation->x;
child_allocation->y += allocation->y; child_allocation->y += allocation->y;
} }
#define __GTK_FRAME_C__
#include "gtkaliasdef.c"

4
gtk/gtkgamma.c
View File

@ -29,7 +29,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "gtkalias.h"
#include "gtkgamma.h" #include "gtkgamma.h"
#include "gtkcurve.h" #include "gtkcurve.h"
#include "gtkdialog.h" #include "gtkdialog.h"
@ -45,6 +44,7 @@
#include "gtkvbox.h" #include "gtkvbox.h"
#include "gtkwindow.h" #include "gtkwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkalias.h"
static GtkVBoxClass *parent_class = NULL; static GtkVBoxClass *parent_class = NULL;
@ -486,3 +486,5 @@ gtk_gamma_curve_destroy (GtkObject *object)
(* GTK_OBJECT_CLASS (parent_class)->destroy) (object); (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
} }
#define __GTK_GAMMA_CURVE_C__
#include "gtkaliasdef.c"

10
gtk/gtkgamma.h
View File

@ -42,10 +42,7 @@
#include <gtk/gtkvbox.h> #include <gtk/gtkvbox.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
#define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ()) #define GTK_TYPE_GAMMA_CURVE (gtk_gamma_curve_get_type ())
#define GTK_GAMMA_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve)) #define GTK_GAMMA_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_GAMMA_CURVE, GtkGammaCurve))
@ -87,9 +84,6 @@ GType gtk_gamma_curve_get_type (void) G_GNUC_CONST;
GtkWidget* gtk_gamma_curve_new (void); GtkWidget* gtk_gamma_curve_new (void);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_GAMMA_CURVE_H__ */ #endif /* __GTK_GAMMA_CURVE_H__ */

5
gtk/gtkgc.c
View File

@ -25,8 +25,8 @@
*/ */
#include <config.h> #include <config.h>
#include "gtkalias.h"
#include "gtkgc.h" #include "gtkgc.h"
#include "gtkalias.h"
typedef struct _GtkGCKey GtkGCKey; typedef struct _GtkGCKey GtkGCKey;
@ -415,3 +415,6 @@ gtk_gc_drawable_equal (GtkGCDrawable *a,
{ {
return (a->depth == b->depth); return (a->depth == b->depth);
} }
#define __GTK_GC_C__
#include "gtkaliasdef.c"

10
gtk/gtkgc.h
View File

@ -31,10 +31,7 @@
#include <gdk/gdk.h> #include <gdk/gdk.h>
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
GdkGC* gtk_gc_get (gint depth, GdkGC* gtk_gc_get (gint depth,
GdkColormap *colormap, GdkColormap *colormap,
@ -43,9 +40,6 @@ GdkGC* gtk_gc_get (gint depth,
void gtk_gc_release (GdkGC *gc); void gtk_gc_release (GdkGC *gc);
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* __GTK_GC_H__ */ #endif /* __GTK_GC_H__ */

Some files were not shown because too many files have changed in this diff Show More