Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dorota Czaplejewicz
gtk
Commits
0a07e973
Commit
0a07e973
authored
Jul 09, 2010
by
Javier Jardón
Browse files
gtk/: fully remove gtkalias hacks
https://bugzilla.gnome.org/show_bug.cgi?id=623845
parent
404e7d0e
Changes
245
Hide whitespace changes
Inline
Side-by-side
docs/reference/gtk/Makefile.am
View file @
0a07e973
...
...
@@ -21,7 +21,6 @@ CFILE_GLOB=$(top_srcdir)/gtk/*.c
# Header files to ignore when scanning
IGNORE_HFILES
=
\
gtkalias.h
\
fnmatch.h
\
gtkdebug.h
\
gtkbuilderprivate.h
\
...
...
gtk/Makefile.am
View file @
0a07e973
...
...
@@ -103,20 +103,9 @@ endif
gtk.def
:
gtk.symbols
(
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'
)
>
$(srcdir)
/gtk.def
gtkalias.h
:
gtk.symbols
$(PERL)
$(srcdir)
/makegtkalias.pl <
$(srcdir)
/gtk.symbols
>
gtkalias.h
gtkaliasdef.c
:
gtk.symbols
$(PERL)
$(srcdir)
/makegtkalias.pl
-def
<
$(srcdir)
/gtk.symbols
>
gtkaliasdef.c
check-aliases
:
@
$(TESTS_ENVIRONMENT)
$(srcdir)
/aliasfilescheck.sh
.PHONY
:
check-aliases
TESTS_ENVIRONMENT
=
srcdir
=
"
$(srcdir)
"
gtk_all_c_sources
=
"
$(gtk_all_c_sources)
"
TESTS
=
aliasfilescheck.sh
if
OS_LINUX
TESTS
+
=
abicheck.sh
pltcheck.sh
TESTS
=
abicheck.sh
endif
libgtkincludedir
=
$(includedir)
/gtk-3.0/gtk
...
...
@@ -732,13 +721,11 @@ gtk_built_public_sources = \
# built headers that don't get installed
gtk_built_private_headers
=
\
gtkalias.h
\
gtkmarshalers.h
\
gtkbuiltincache.h
\
gtkimcontextsimpleseqs.h
gtk_built_sources
=
\
gtkaliasdef.c
\
gtktypebuiltins.c
\
gtktypefuncs.c
\
gtkmarshalers.c
\
...
...
@@ -794,7 +781,6 @@ stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list
&&
echo
timestamp
>
$
(
@F
)
gtkmarshalers.c
:
@REBUILD@ gtkmarshalers.list
(
echo
"#include
\"
gtkmarshalers.h
\"
"
;
\
echo
"#include
\"
gtkalias.h
\"
"
;
\
$(GLIB_GENMARSHAL)
--prefix
=
_gtk_marshal
$(srcdir)
/gtkmarshalers.list
--body
)
>>
xgen-gmlc
\
&&
cp
xgen-gmlc gtkmarshalers.c
\
&&
rm
-f
xgen-gmlc
...
...
@@ -1331,10 +1317,7 @@ EXTRA_DIST += \
gtkrc.key.mac
\
makefile.msc
\
makefile.msc.in
\
makegtkalias.pl
\
aliasfilescheck.sh
\
abicheck.sh
\
pltcheck.sh
\
gtktypebuiltins.c.template
\
gtktypebuiltins.h.template
...
...
gtk/aliasfilescheck.sh
deleted
100755 → 0
View file @
404e7d0e
#! /bin/sh
if
test
"x
$gtk_all_c_sources
"
=
x
;
then
echo
gtk_all_c_sources variable not defined
exit
1
fi
grep
'IN_FILE'
${
srcdir
-.
}
/gtk.symbols |
sed
's/.*(//;s/).*//'
|
grep
__ |
sort
-u
>
expected-files
{
cd
${
srcdir
-.
}
;
grep
'^ *# *define __'
$gtk_all_c_sources
;
}
|
sed
's/.*define //;s/ *$//'
|
sort
>
actual-files
diff expected-files actual-files
&&
rm
-f
expected-files actual-files
gtk/gtkaboutdialog.c
View file @
0a07e973
...
...
@@ -55,8 +55,6 @@
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
/**
* SECTION:gtkaboutdialog
...
...
@@ -2441,6 +2439,3 @@ gtk_show_about_dialog (GtkWindow *parent,
gtk_window_present
(
GTK_WINDOW
(
dialog
));
}
#define __GTK_ABOUT_DIALOG_C__
#include
"gtkaliasdef.c"
gtk/gtkaccelgroup.c
View file @
0a07e973
...
...
@@ -36,7 +36,7 @@
#include
"gtkmain.h"
/* For _gtk_boolean_handled_accumulator */
#include
"gdk/gdkkeysyms.h"
#include
"gtkmarshalers.h"
#include
"gtkalias.h"
/**
* SECTION:gtkaccelgroup
...
...
@@ -1466,6 +1466,3 @@ gtk_accelerator_get_default_mod_mask (void)
{
return
default_accel_mod_mask
;
}
#define __GTK_ACCEL_GROUP_C__
#include
"gtkaliasdef.c"
gtk/gtkaccellabel.c
View file @
0a07e973
...
...
@@ -35,7 +35,7 @@
#include
"gtkmain.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
#include
<gdk/gdkkeysyms.h>
/**
...
...
@@ -899,6 +899,3 @@ gtk_accel_label_refetch (GtkAccelLabel *accel_label)
return
FALSE
;
}
#define __GTK_ACCEL_LABEL_C__
#include
"gtkaliasdef.c"
gtk/gtkaccelmap.c
View file @
0a07e973
...
...
@@ -23,8 +23,7 @@
#include
"gtkmarshalers.h"
#include
"gtkwindow.h"
/* in lack of GtkAcceleratable */
#include
"gtkintl.h"
#include
"gtkalias.h"
#include
"gtkintl.h"
#include
<glib/gstdio.h>
...
...
@@ -1032,6 +1031,3 @@ gtk_accel_map_save (const gchar *file_name)
}
#endif
#define __GTK_ACCEL_MAP_C__
#include
"gtkaliasdef.c"
gtk/gtkaccessible.c
View file @
0a07e973
...
...
@@ -23,7 +23,6 @@
#include
"gtkwidget.h"
#include
"gtkintl.h"
#include
"gtkaccessible.h"
#include
"gtkalias.h"
/**
* SECTION:gtkaccessible
...
...
@@ -116,6 +115,3 @@ gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
&
accessible
->
widget
);
}
}
#define __GTK_ACCESSIBLE_C__
#include
"gtkaliasdef.c"
gtk/gtkaction.c
View file @
0a07e973
...
...
@@ -92,7 +92,6 @@
#include
"gtkprivate.h"
#include
"gtkbuildable.h"
#include
"gtkactivatable.h"
#include
"gtkalias.h"
#define GTK_ACTION_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_ACTION, GtkActionPrivate))
...
...
@@ -1826,6 +1825,3 @@ gtk_action_create_menu (GtkAction *action)
return
NULL
;
}
#define __GTK_ACTION_C__
#include
"gtkaliasdef.c"
gtk/gtkactiongroup.c
View file @
0a07e973
...
...
@@ -43,7 +43,6 @@
#include
"gtkbuilderprivate.h"
#include
"gtkprivate.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))
...
...
@@ -1436,6 +1435,3 @@ _gtk_action_group_emit_post_activate (GtkActionGroup *action_group,
{
g_signal_emit
(
action_group
,
action_group_signals
[
POST_ACTIVATE
],
0
,
action
);
}
#define __GTK_ACTION_GROUP_C__
#include
"gtkaliasdef.c"
gtk/gtkactivatable.c
View file @
0a07e973
...
...
@@ -266,7 +266,6 @@
#include
"gtktypeutils.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
static
void
gtk_activatable_class_init
(
gpointer
g_iface
);
...
...
@@ -559,6 +558,3 @@ gtk_activatable_get_use_action_appearance (GtkActivatable *activatable)
return
use_appearance
;
}
#define __GTK_ACTIVATABLE_C__
#include
"gtkaliasdef.c"
gtk/gtkadjustment.c
View file @
0a07e973
...
...
@@ -29,7 +29,7 @@
#include
"gtkmarshalers.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
enum
{
...
...
@@ -701,6 +701,3 @@ gtk_adjustment_clamp_page (GtkAdjustment *adjustment,
if
(
need_emission
)
gtk_adjustment_value_changed
(
adjustment
);
}
#define __GTK_ADJUSTMENT_C__
#include
"gtkaliasdef.c"
gtk/gtkalignment.c
View file @
0a07e973
...
...
@@ -48,7 +48,7 @@
#include
"gtksizerequest.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
enum
{
PROP_0
,
...
...
@@ -714,6 +714,3 @@ gtk_alignment_get_padding (GtkAlignment *alignment,
if
(
padding_right
)
*
padding_right
=
priv
->
padding_right
;
}
#define __GTK_ALIGNMENT_C__
#include
"gtkaliasdef.c"
gtk/gtkapplication.c
View file @
0a07e973
...
...
@@ -38,8 +38,6 @@
#include
"gtkintl.h"
#include
"gtkprivate.h"
#include
"gtkalias.h"
#include
<gdk/gdk.h>
#ifdef GDK_WINDOWING_X11
#include
<gdk/x11/gdkx.h>
...
...
@@ -711,6 +709,3 @@ gtk_application_class_init (GtkApplicationClass *klass)
g_type_class_add_private
(
gobject_class
,
sizeof
(
GtkApplicationPrivate
));
}
#define __GTK_APPLICATION_C__
#include
"gtkaliasdef.c"
gtk/gtkarrow.c
View file @
0a07e973
...
...
@@ -49,7 +49,6 @@
#include
"gtkarrow.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
#define MIN_ARROW_SIZE 15
...
...
@@ -303,6 +302,3 @@ gtk_arrow_expose (GtkWidget *widget,
return
FALSE
;
}
#define __GTK_ARROW_C__
#include
"gtkaliasdef.c"
gtk/gtkaspectframe.c
View file @
0a07e973
...
...
@@ -47,7 +47,7 @@
#include
"gtkaspectframe.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
enum
{
PROP_0
,
...
...
@@ -350,6 +350,3 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame *frame,
else
GTK_FRAME_CLASS
(
gtk_aspect_frame_parent_class
)
->
compute_child_allocation
(
frame
,
child_allocation
);
}
#define __GTK_ASPECT_FRAME_C__
#include
"gtkaliasdef.c"
gtk/gtkassistant.c
View file @
0a07e973
...
...
@@ -64,8 +64,6 @@
#include
"gtkprivate.h"
#include
"gtkbuildable.h"
#include
"gtkalias.h"
#define GTK_ASSISTANT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_ASSISTANT, GtkAssistantPrivate))
#define HEADER_SPACING 12
...
...
@@ -2551,7 +2549,3 @@ gtk_assistant_buildable_custom_finished (GtkBuildable *buildable,
parent_buildable_iface
->
custom_finished
(
buildable
,
builder
,
child
,
tagname
,
user_data
);
}
#define __GTK_ASSISTANT_C__
#include
"gtkaliasdef.c"
gtk/gtkbbox.c
View file @
0a07e973
...
...
@@ -59,7 +59,7 @@
#include
"gtkorientable.h"
#include
"gtkprivate.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
enum
{
PROP_0
,
...
...
@@ -830,6 +830,3 @@ gtk_button_box_new (GtkOrientation orientation)
"orientation"
,
orientation
,
NULL
);
}
#define __GTK_BUTTON_BOX_C__
#include
"gtkaliasdef.c"
gtk/gtkbin.c
View file @
0a07e973
...
...
@@ -41,7 +41,7 @@
#include
"gtkbin.h"
#include
"gtksizerequest.h"
#include
"gtkintl.h"
#include
"gtkalias.h"
static
void
gtk_bin_add
(
GtkContainer
*
container
,
GtkWidget
*
widget
);
...
...
@@ -277,6 +277,3 @@ gtk_bin_get_child (GtkBin *bin)
return
bin
->
child
;
}
#define __GTK_BIN_C__
#include
"gtkaliasdef.c"
gtk/gtkbindings.c
View file @
0a07e973
...
...
@@ -36,7 +36,6 @@
#include
"gtkkeyhash.h"
#include
"gtkwidget.h"
#include
"gtkrc.h"
#include
"gtkalias.h"
/* --- defines --- */
...
...
@@ -1676,6 +1675,3 @@ _gtk_binding_reset_parsed (void)
slist
=
next
;
}
}
#define __GTK_BINDINGS_C__
#include
"gtkaliasdef.c"
Prev
1
2
3
4
5
…
13
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment