Commit Graph

96 Commits

Author SHA1 Message Date
Colin Walters
913cdf3be7 GDK: Prefix key names with KEY_
The keysyms create a lot of potential namespace conflicts for
C, and are especially problematic for introspection, where we take
constants into the namespace, so GDK_Display conflicts with GdkDisplay.

For C application compatiblity, add gdkkeysyms-compat.h which uses
the old names.

Just one user in GTK+ continues to use gdkkeysyms-compat.h, which is
the gtkimcontextsimple.c, since porting that requires porting more
custom Perl code.
2010-09-08 18:51:44 -04:00
Javier Jardón
0a07e9733b gtk/: fully remove gtkalias hacks
https://bugzilla.gnome.org/show_bug.cgi?id=623845
2010-07-10 02:51:26 +02:00
Javier Jardón
f39f644fb2 Move GtkAccelGroup private structure to shared header file
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=602174
2010-05-03 01:51:20 +02:00
Christian Dywan
059c22c3b2 Add and use internal accessor for accelerables in GtkAccelGroup 2010-05-03 01:51:19 +02:00
Cody Russell
3c8c4004b6 Move GSEAL'd members of GtkAccelGroup into private struct 2010-05-03 01:51:18 +02:00
Stefan Kost
d4a159d488 [docs] improve docs for gtk_accelerator_parse().
Link to gdk_keyval_from_name() and give example for non obvious accelerator
strings.
2010-04-16 21:30:47 +03:00
Johan Dahlin
fe85272112 [annotations] Add allow-none
This commit was created using a script that searched for all docstrings
containing a parameter and the string 'or %NULL'.
Gdk backends and demos excluded as they are not part of a public API

https://bugzilla.gnome.org/show_bug.cgi?id=610474
2010-02-19 17:57:51 -02:00
Colin Walters
6529c07614 [introspection] Merge in Gtk-custom.c annotations
The Gtk-custom.c file in gir-repository contained a number of
introspection annotations.  Merge those into the GTK source files.

Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
2009-12-16 17:22:01 -02:00
Christian Dywan
f4d5ed5397 Allow removing all closures with gtk_accel_group_disconnect
https://bugzilla.gnome.org/show_bug.cgi?id=599403
2009-10-27 21:25:56 +01:00
Javier Jardón
ff76366652 Move documentation from templates to inline comments: GtkAccelGroup
https://bugzilla.gnome.org/show_bug.cgi?id=597865
2009-10-15 03:11:39 +02:00
Matthias Clasen
7e6cd2b31c Fix a memory leak in GtkAccelGroup
Unref closures in accel group finalization (#577824).
2009-04-07 19:11:33 -04:00
Matthias Clasen
9f7e7c435b Documentation fixes
2008-12-28  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkhsv.c:
        * gtk/gtkwidget.c:
        * gtk/gtkaccelgroup.c: Documentation fixes

        * gtk/gtkstatusicon.c:
        * gtk/gtkentry.c:
        * gtk/gtkeditable.[hc]: Make parameter names match to make gtk-doc
        happy.


svn path=/trunk/; revision=21953
2008-12-28 06:58:09 +00:00
Sven Neumann
b5796771d2 gtk/gtkaccelgroup.c gtk/gtkactiongroup.c gtk/gtkcalendar.c
2008-08-11  Sven Neumann  <sven@gimp.org>

	* gtk/gtkaccelgroup.c
	* gtk/gtkactiongroup.c
	* gtk/gtkcalendar.c
	* gtk/gtkcelleditable.c
	* gtk/gtkclipboard-quartz.c
	* gtk/gtkclipboard.c
	* gtk/gtkcolorbutton.c
	* gtk/gtkcolorsel.c
	* gtk/gtkcontainer.c
	* gtk/gtkcurve.c: use canonical signal names.


svn path=/trunk/; revision=21068
2008-08-11 13:07:18 +00:00
Matthias Clasen
94ba6bba06 Doc fixes
svn path=/trunk/; revision=20887
2008-07-21 23:23:41 +00:00
Matthias Clasen
a46f8f3726 Fix default value
svn path=/trunk/; revision=20767
2008-07-04 20:46:45 +00:00
Cody Russell
57223c9a05 Revert name change
svn path=/trunk/; revision=20724
2008-07-01 22:57:50 +00:00
Cody Russell
fce9c8b7d4 Practically everything changed.
2008-06-30  Cody Russell  <bratsche@gnome.org>

        * Practically everything changed.

        Change	all references	of GIMP	Toolkit	(and variations	of it)
        to GTK+	Toolkit, showing no mercy at all to our	beloved
	ancestry. (#540529)


svn path=/trunk/; revision=20709
2008-06-30 23:01:56 +00:00
Michael Natterer
91f84cd1d8 use g_param_spec_flags(), not enum() when registering the "modifier-mask"
2008-06-22  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaccelgroup.c: use g_param_spec_flags(), not enum() when
	registering the "modifier-mask" property.


svn path=/trunk/; revision=20670
2008-06-22 16:42:22 +00:00
Johan Dahlin
d97cdbdf53 Include "config.h" instead of <config.h> Command used: find -name
2008-06-21  Johan Dahlin  <jdahlin@async.com.br>

    * *.[ch]: Include "config.h" instead of <config.h>
    Command used:
    find -name \*.[ch]|xargs perl -p -i -e 's/^#include <config.h>/#include "config.h"/g'
    Rubberstamped by Mitch and Tim


svn path=/trunk/; revision=20669
2008-06-22 14:28:52 +00:00
Martyn James Russell
c8322b8c0e Fix warnings from calling g_object_notify() on a GtkAccelGroup without
* gtk/gtkaccelgroup.c: Fix warnings from calling
	g_object_notify() on a GtkAccelGroup without casting to a
	GObject.

svn path=/trunk/; revision=20652
2008-06-20 15:10:00 +00:00
Martyn James Russell
7e374415b6 Don't call g_object_notify() with properties that don't exist. Also, make
* gtk/gtkaccelgroup.c: Don't call g_object_notify() with
	properties that don't exist. Also, make sure we notify for
	the "is-locked" property.

svn path=/trunk/; revision=20650
2008-06-20 14:45:54 +00:00
Johan Dahlin
e46eeab2a9 Add missing Since: gtk-doc markup for newly added GSEAL API. Change all
2008-06-20  Johan Dahlin  <jdahlin@async.com.br>

    * gtk/gtkaccelgroup.c:
    * gtk/gtkcolorseldialog.c:
    * gtk/gtkcontainer.c:
    * gtk/gtkdialog.c:
    * gtk/gtkentry.c (gtk_entry_class_init):
    * gtk/gtkfontsel.c:
    * gtk/gtkhandlebox.c:
    * gtk/gtklayout.c:
    * gtk/gtkmenu.c (gtk_menu_class_init):
    * gtk/gtkmenuitem.c (gtk_menu_item_class_init):
    * gtk/gtkplug.c (gtk_plug_class_init):
    * gtk/gtkselection.c:
    * gtk/gtksocket.c:
    * gtk/gtktreeselection.c:
    * gtk/gtkwidget.c (gtk_widget_class_init):
    * gtk/gtkwindow.c:
    Add missing Since: gtk-doc markup for newly added GSEAL API.
    Change all Since: GSEAL-branch to Since: 2.14.


svn path=/trunk/; revision=20639
2008-06-20 13:54:31 +00:00
Michael Natterer
38684d0a35 fix some formatting and whitespace in the code merged from the GSEAL
2008-06-20  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaccelgroup.[ch]: fix some formatting and whitespace in
	the code merged from the GSEAL branch.


svn path=/trunk/; revision=20638
2008-06-20 13:34:17 +00:00
Tim Janik
5f1120a0b0 Seal GtkAccelGroup - fixed some issues with the initial attempt thanks to comments from Tim
svn path=/trunk/; revision=20535
2008-06-20 11:02:02 +00:00
Tim Janik
2436a762e4 Sealed GtkAccelGroup and added
* gtk/gtkaccelgroup.[ch]: Added GObject properties for lock_count,
  modifier_mask, acceleratables, n_accels and priv_accels. Added seal
  macro for public struct members which should be private.

svn path=/trunk/; revision=20482
2008-06-20 10:57:08 +00:00
Matthias Clasen
b8edde55e2 Add some docs
svn path=/trunk/; revision=20381
2008-06-13 17:40:17 +00:00
Christian Persch
dcc9428036 Bug 535608 – do not string-copy accel paths in the menu code
Don't store the accel path as a string in gtkmenu/gtkmenuitem.
The accel path will be interned anyway, so keeping a string copy around
is just a waste of memory.
Improve the documentation to mention this.

svn path=/trunk/; revision=20331
2008-06-07 20:40:20 +00:00
Matthias Clasen
2855f81636 Fixes
svn path=/trunk/; revision=20197
2008-05-27 23:02:02 +00:00
Gustavo J. A. M. Carneiro
7b1c6c9902 Bug 448484 – GtkAccelGroup forgets to remove closure invalidate notifiers when finalizing
svn path=/trunk/; revision=18181
2007-06-18 09:42:27 +00:00
Matthias Clasen
6563aaec03 Don't access invalid memory. (#429732, Armin Burgmeier)
2007-04-26  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkaccelgroup.c (gtk_accel_group_finalize): Don't access
        invalid memory.  (#429732, Armin Burgmeier)



svn path=/trunk/; revision=17647
2007-04-26 05:50:18 +00:00
Matthias Clasen
113f364a37 More of the same 2006-05-14 04:25:34 +00:00
Matthias Clasen
f26aad1916 Boilerplate reduction 2006-05-02 23:56:43 +00:00
Matthias Clasen
77494a0a1c Include Super, Hyper and Meta in the default accel mod mask.
2005-09-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccelgroup.c: Include Super, Hyper and Meta in the
	default accel mod mask.
2005-09-06 19:52:50 +00:00
Matthias Clasen
582af23699 Don't use GDK_ALT_MASK.
2005-09-06  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccelgroup.c (gtk_accelerator_parse):
	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
	Don't use GDK_ALT_MASK.

	* gdk/gdktypes.h: No need to introduce GDK_ALT_MASK
2005-09-06 19:25:47 +00:00
Matthias Clasen
244d41b94a Add tests for extra virtual modifiers.
2005-09-06  Matthias Clasen  <mclasen@redhat.com>

	* tests/testgtk.c (create_key_lookup): Add tests for extra virtual
	modifiers.

	* gtk/gtkkeyhash.c (_gtk_key_hash_lookup): Try to match both against
	Mod2 - Mod5 and against Super, Hyper, Meta.

	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
	* gtk/gtkaccelgroup.c (gtk_accelerator_parse)
	(gtk_accelerator_name): Support Super, Hyper Meta and Mod2 - Mod5.
2005-09-06 18:13:56 +00:00
Matthias Clasen
94eec04267 Intern some more strings.
2005-09-01  Matthias Clasen  <mclasen@redhat.com>

        * gdk/*.c: Intern some more strings.
        * gtk/gtkintl.h:
        * gtk/*.c: Define an I_() macro and use it instead of the
        bulky g_intern_static_string().
2005-09-01 05:11:46 +00:00
Matthias Clasen
c09cc89317 Intern type names in code generated by glib-mkenums, too.
2005-08-31  Matthias Clasen  <mclasen@redhat.com>

	* gdk/Makefile.am:
	* gtk/Makefile.am: Intern type names in code generated by
	glib-mkenums, too.

	* gtk/*.c:
	* gdk/x11/*.c:
	* gdk/*.c: Intern type names before registering the type to avoid
	unnecessary copies.
2005-08-31 16:53:43 +00:00
Matthias Clasen
cca8dd6347 Make PLT-reduction work with gcc4, and don't include everything in
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.
2005-03-20 07:01:23 +00:00
Manish Singh
cbf21238c3 remove unused function.
Fri Feb  4 14:16:31 2005  Manish Singh  <yosh@gimp.org>

        * gtk/gtkaccelgroup.c (substitute_underscores): remove unused
        function.

        * gtk/gtkcellrendererpixbuf.c (gtk_cell_renderer_pixbuf_render):
        Add some extra parens for bitop order of operations disambiguiation.

        * gtk/gtkstock.c: Fix const confusion, make our own copy of the
        domain when setting a translate function.

        * tests/testcombo.c: removed unused variable.
2005-02-04 22:17:11 +00:00
Matthias Clasen
67088411a5 Document signals. (#163319, Murray Cumming)
2005-01-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccelgroup.c (gtk_accel_group_class_init): Document
	signals.  (#163319, Murray Cumming)
2005-01-10 05:44:45 +00:00
Matthias Clasen
0dfe684dde Provide access to the string representation of accelerators used in
2004-10-05  Matthias Clasen  <mclasen@redhat.com>

	Provide access to the string representation of accelerators used
	in GtkAccelLabel.  (#154068, John Spray)

	* gtk/gtkaccelgroup.h:
	* gtk/gtkaccelgroup.c (gtk_accelerator_get_label): New function
	to return the accelerator label used in GtkAccelLabel.
	(gtk_accelerator_name): Update docs to point to
	gtk_accelerator_get_label().
	* gtk/gtkaccellabel.h:
	* gtk/gtkaccellabel.c (_gtk_accel_label_class_get_accelerator_label):
	New auxiliary function which creates the string representing the
	accelerator.
2004-10-05 05:17:22 +00:00
Matthias Clasen
3612aee585 Add hidden aliases for exported symbols which are used internally in order
Mon Aug  9 12:48:04 2004  Matthias Clasen  <maclas@gmx.de>

	Add hidden aliases for exported symbols which are
	used internally in order to get rid of many PLT
	entries.  (#145519, Arjan van de Ven)

	* gtk/Makefile.am: Add rules to generate gtk.def and
	from gtk.symbols, and make make check check the abi
	with abicheck.sh.
	(gtk_private_h_sources): Add gtkinternals.h
	(gtk_built_private_headers): Add gtkalias.h
	(gtk_extra_sources): Add gtk.symbols
	(EXTRA_DIST): Add makegtkalias.pl and abicheck.sh

	* gtk/gtk.symbols: New file. Definition of the GTK+ ABI.
	The file can be processed by cpp to filter out certain
	subsets of symbols.

	* gtk/abicheck.sh: New file. Script to check the actually
	symbols exported from libgtk-x11.2.0.so against the symbols
	found in gtk.symbols.

	* gtk/makegtkalias.pl: New file. Perl script to generate the
	header containing the alias definitions for internally used
	exported symbols from a list of symbols.

	* gtk/gtkinternals.h: New file. An uninstalled header listing
	symbols which must be exported for some reason and do not appear
	in any other header.

	* gtk/*.c: Include gtkalias.h
2004-08-09 16:59:53 +00:00
Federico Mena Quintero
80581c3011 Fixes #136082 and #135265, patch by Morten Welinder.
2004-03-05  Federico Mena Quintero  <federico@ximian.com>

	Fixes #136082 and #135265, patch by Morten Welinder.

	* configure.in: Use AC_SYS_LARGEFILE.

	* */*.c: #include <config.h>
2004-03-06 03:38:59 +00:00
Manish Singh
532062df96 Applied patch from Ross McFarland <rwmcfa1@neces.com>, initialize *count_p
Fri Dec  5 15:30:16 2003  Manish Singh  <yosh@gimp.org>

        * gtk/gtkaccelgroup.c (quick_accel_find): Applied patch from
        Ross McFarland <rwmcfa1@neces.com>, initialize *count_p to 0
        before doing anything to prevent garbage returns.
2003-12-05 23:33:59 +00:00
Tim Janik
448b576dc1 allow accel activation depending on sensitivity and the attach widget.
Thu Nov 27 16:19:03 2003  Tim Janik  <timj@gtk.org>

        * gtk/gtkmenu.c: allow accel activation depending on sensitivity
        and the attach widget.

        * gtk/gtkmenuitem.c: allow accel activation depending on visibility,
        sensitivity and the parent menu.

        * gtk/gtkwidget.[hc]: introduced ::can-activate-accel signal which
        checks whether accelerators may activate a widget. the default handler
        demands the widget be sensitive and visible+viewable.

        * gtk/gtkaccelgroup.[hc]: export gtk_accel_group_activate().
2003-11-27 15:51:32 +00:00
Manish Singh
62341005d1 Deprecation cleanup
Thu Oct 10 14:58:47 2002  Manish Singh  <yosh@gimp.org>

        * gtk/gtkaccelgroup.c gtk/gtkarrow.[ch] gtk/gtkeventbox.[ch]
        gtk/gtkiconfactory.c gtk/gtkinvisible.[ch] gtk/gtktextchild.c:
        Deprecation cleanup
2002-10-10 22:00:09 +00:00
Owen Taylor
ad07608cc3 Add a GtkAccelGroupFindFunc to clean up the prototype. (#76670, Vitaly
Tue Sep 24 17:49:52 2002  Owen Taylor  <otaylor@redhat.com>
        * gtk/gtkaccelgroup.[ch] (gtk_accel_group_find):
        Add a GtkAccelGroupFindFunc to clean up the
        prototype. (#76670, Vitaly Tishkov)

        * gdk/x11/gdkvisual-x11.c gdk/x11/gdkx.h: Rename
        gdkx_visual_get_for_screen() to
        gdk_x11_screen_lookup_visual(). (#85702)
2002-09-24 21:54:15 +00:00
Owen Taylor
11aed263b7 Set the width of the layout to the actual wrap width (our requisition) not
Tue May 14 16:44:09 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtklabel.c (gtk_label_ensure_layout): Set
        the width of the layout to the actual wrap width
        (our requisition) not the width we set when calculating
        the width. This results in the lines being justified
        within the correct area. (#79157, Anders Carlsson)

        * gtk/gtkaccelgroup.c gtk/gtkmarshelers.list: Corrected
        registered parameter types of "accel_activate" and
        "accel_changed" signals. (Patch from Murray Cumming, #78798)

        * gtk/gtkrc.c (gtk_rc_make_default_dir): Switch
        binary-version and type to correspond to the
        current ordering in _gtk_get_module_path.
        (#78746, Sergey Kuzminov)

        * gtk/gtkrc.c (gtk_rc_get_module_dir): Add docs
        pointing to the GTK_PATH documentation.

        * gtk/Makefile.am (uninstall-local): Delete
        key themes as well. (#81286, Kristian Rietveld.)
2002-05-14 20:55:22 +00:00
Owen Taylor
a302a5ea5b Call gdk_keyval_to_lower() on the key passed in, since we lowercase all
Fri Mar 29 18:09:18 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkaccelgroup.c (gtk_accel_group_query): Call
        gdk_keyval_to_lower() on the key passed in, since we
        lowercase all other key vals passed in, so querying
        keyvals will otherwise fail if the caller used
        an uppercase accelerators (#76899, Vitaly Tishkov)
2002-03-29 23:15:03 +00:00
Matthias Clasen
74c2378178 Trivial typo fix. (Vitaly Tishkov, #75726)
* gtk/gtkaccelgroup.c (gtk_accelerator_valid): Trivial typo
	fix. (Vitaly Tishkov, #75726)
2002-03-21 21:59:41 +00:00