remove unused codepath.

Fri Oct  4 21:21:47 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
	codepath.

	* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
	gtk_widget_queue_draw() instead of gtk_widget_draw().
This commit is contained in:
Soeren Sandmann 2002-10-04 19:46:36 +00:00 committed by Søren Sandmann Pedersen
parent fd83bdbadb
commit d2aa626845
23 changed files with 313 additions and 282 deletions

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -1,3 +1,11 @@
Fri Oct 4 21:21:47 2002 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtkhandlebox.c (gtk_handle_box_paint): remove unused
codepath.
* gtk/gtkmenuitem.c (gtk_real_menu_item_{de,}select): call
gtk_widget_queue_draw() instead of gtk_widget_draw().
Fri Oct 4 14:49:04 2002 Owen Taylor <otaylor@redhat.com>
Patch from Shivram U <shivaram.upadhyayula@wipro.com>

View File

@ -365,6 +365,21 @@ XlibRGB
@obj: A GTK+ object.
<!-- ##### STRUCT GdkPixbufFormat ##### -->
<para>
A #GdkPixbufFormat contains information about the image format accepted by a
module. Only modules should access the fields directly.
</para>
@name: the name of the image format
@signature: the signature of the module
@domain: the message domain for the @description
@description: a description of the image format
@mime_types: a %NULL-terminated array of MIME types for the image format.
@extensions: a %NULL-terminated array of typical filename extensions for the
image format.
@flags:
<!-- ##### STRUCT GdkPixbufFrame ##### -->
<para>
This object describes an individual frame of an animation.
@ -397,6 +412,92 @@ XlibRGB
@pixbuf: The pixbuf that is losing its last reference.
@data: User closure data.
<!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
<para>
Defines the type of the function used to fill a
#GdkPixbufFormat structure with information about a module.
</para>
@info: a #GdkPixbufFormat.
<!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
<para>
Defines the type of the function used to set the vtable of a
#GdkPixbufModule when it is loaded.
</para>
@module: a #GdkPixbufModule.
<!-- ##### STRUCT GdkPixbufModulePattern ##### -->
<para>
The signature of a module is a set of prefixes. Prefixes are encoded as
pairs of ordinary strings, where the second string, if not %NULL,
may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be
matched, not matched, "don't-care"-bytes, zeros and non-zeros.
Each prefix has an associated integer that describes the relevance of
the prefix, with 0 meaning a mismatch and 100 a "perfect match".
</para>
<para>
The signature of a module is stored as an array of
#GdkPixbufModulePattern<!-- -->s.
</para>
@prefix: the prefix for this pattern
@mask: mask containing bytes which modify how the prefix is matched against
test data
@relevance: relevance of this pattern
<!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
<para>
Defines the type of the function that gets called once the initial
setup of @pixbuf is done.
</para>
<para>
#GdkPixbufLoader uses a function of this type to emit the
"<link linkend="GdkPixbufLoader-area-prepared">area_prepared</link>"
signal.
</para>
@pixbuf: the #GdkPixbuf that is currently being loaded.
@anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
@user_data: the loader.
<!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
<para>
Defines the type of the function that gets called once the size
of the loaded image is known.
</para>
<para>
The function is expected to set @width and @height to the desired
size to which the image should be scaled. If a module has no efficient
way to achieve the desired scaling during the loading of the image, it may
either ignore the size request, or only approximate it -- &gdk-pixbuf; will
then perform the required scaling on the completely loaded image.
</para>
@width: pointer to a location containing the current image width
@height: pointer to a location containing the current image height
@user_data: the loader.
<!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
<para>
Defines the type of the function that gets called every time a region
of @pixbuf is updated.
</para>
<para>
#GdkPixbufLoader uses a function of this type to emit the
"<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
signal.
</para>
@pixbuf: the #GdkPixbuf that is currently being loaded.
@x: the X origin of the updated area.
@y: the Y origin of the updated area.
@width: the width of the updated area.
@height: the height of the updated area.
@user_data: the loader.
<!-- ##### ARG GnomeCanvasPixbuf:height ##### -->
<para>
Indicates the height the pixbuf will be scaled to. This argument
@ -567,6 +668,53 @@ End:
</para>
<!-- ##### FUNCTION gdk_pixbuf_format_get_description ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_extensions ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_mime_types ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_name ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_is_writable ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_get_formats ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_new_from_stream ##### -->
<para>

View File

@ -65,165 +65,6 @@ They are not covered by the same stability guarantees as the regular
</para>
<!-- ##### FUNCTION gdk_pixbuf_get_formats ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_name ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_description ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_mime_types ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_get_extensions ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### FUNCTION gdk_pixbuf_format_is_writable ##### -->
<para>
</para>
@format:
@Returns:
<!-- ##### STRUCT GdkPixbufFormat ##### -->
<para>
A #GdkPixbufFormat contains information about the image format accepted by a
module. Only modules should access the fields directly.
</para>
@name: the name of the image format
@signature: the signature of the module
@domain: the message domain for the @description
@description: a description of the image format
@mime_types: a %NULL-terminated array of MIME types for the image format.
@extensions: a %NULL-terminated array of typical filename extensions for the
image format.
@flags:
<!-- ##### STRUCT GdkPixbufModulePattern ##### -->
<para>
The signature of a module is a set of prefixes. Prefixes are encoded as
pairs of ordinary strings, where the second string, if not %NULL,
may contain ' ', '!', 'x', 'z', and 'n' to indicate bytes that must be
matched, not matched, "don't-care"-bytes, zeros and non-zeros.
Each prefix has an associated integer that describes the relevance of
the prefix, with 0 meaning a mismatch and 100 a "perfect match".
</para>
<para>
The signature of a module is stored as an array of
#GdkPixbufModulePattern<!-- -->s.
</para>
@prefix: the prefix for this pattern
@mask: mask containing bytes which modify how the prefix is matched against
test data
@relevance: relevance of this pattern
<!-- ##### USER_FUNCTION GdkPixbufModuleFillVtableFunc ##### -->
<para>
Defines the type of the function used to set the vtable of a
#GdkPixbufModule when it is loaded.
</para>
@module: a #GdkPixbufModule.
<!-- ##### USER_FUNCTION GdkPixbufModuleFillInfoFunc ##### -->
<para>
Defines the type of the function used to fill a
#GdkPixbufFormat structure with information about a module.
</para>
@info: a #GdkPixbufFormat.
<!-- ##### USER_FUNCTION GdkPixbufModuleSizeFunc ##### -->
<para>
Defines the type of the function that gets called once the size
of the loaded image is known.
</para>
<para>
The function is expected to set @width and @height to the desired
size to which the image should be scaled. If a module has no efficient
way to achieve the desired scaling during the loading of the image, it may
either ignore the size request, or only approximate it -- &gdk-pixbuf; will
then perform the required scaling on the completely loaded image.
</para>
@width: pointer to a location containing the current image width
@height: pointer to a location containing the current image height
@user_data: the loader.
<!-- ##### USER_FUNCTION GdkPixbufModulePreparedFunc ##### -->
<para>
Defines the type of the function that gets called once the initial
setup of @pixbuf is done.
</para>
<para>
#GdkPixbufLoader uses a function of this type to emit the
"<link linkend="GdkPixbufLoader-area-prepared">area_prepared</link>"
signal.
</para>
@pixbuf: the #GdkPixbuf that is currently being loaded.
@anim: if an animation is being loaded, the #GdkPixbufAnimation, else %NULL.
@user_data: the loader.
<!-- ##### USER_FUNCTION GdkPixbufModuleUpdatedFunc ##### -->
<para>
Defines the type of the function that gets called every time a region
of @pixbuf is updated.
</para>
<para>
#GdkPixbufLoader uses a function of this type to emit the
"<link linkend="GdkPixbufLoader-area-updated">area_updated</link>"
signal.
</para>
@pixbuf: the #GdkPixbuf that is currently being loaded.
@x: the X origin of the updated area.
@y: the Y origin of the updated area.
@width: the width of the updated area.
@height: the height of the updated area.
@user_data: the loader.
<!-- ##### STRUCT GdkPixbufModule ##### -->
<para>
A #GdkPixbufModule contains the necessary functions to load and save

View File

@ -596,6 +596,14 @@ status information, so the application does not need to do anything.
</para>
<!-- ##### FUNCTION gdk_display_set_sm_client_id ##### -->
<para>
</para>
@display:
@sm_client_id:
<!-- ##### FUNCTION gdk_font_full_name_free ##### -->
<para>
Frees a full font name obtained from gdk_font_full_name_get().

View File

@ -196,15 +196,6 @@ of an X display. All its fields are private and should not be accessed directly.
@msec:
<!-- ##### FUNCTION gdk_display_set_sm_client_id ##### -->
<para>
</para>
@display:
@sm_client_id:
<!-- ##### SIGNAL GdkDisplay::closed ##### -->
<para>

View File

@ -162,23 +162,23 @@ box.
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-height ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-y ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-internal-pad-x ##### -->
<para>
</para>
<!-- ##### ARG GtkButtonBox:child-min-width ##### -->
<para>
</para>

View File

@ -248,6 +248,11 @@ mouse cursor is.
</para>
<!-- ##### ARG GtkButton:default-border ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:child-displacement-y ##### -->
<para>
@ -258,11 +263,6 @@ mouse cursor is.
</para>
<!-- ##### ARG GtkButton:default-border ##### -->
<para>
</para>
<!-- ##### ARG GtkButton:default-outside-border ##### -->
<para>

View File

@ -299,12 +299,12 @@ was clicked.
</para>
<!-- ##### ARG GtkDialog:action-area-border ##### -->
<!-- ##### ARG GtkDialog:content-area-border ##### -->
<para>
</para>
<!-- ##### ARG GtkDialog:content-area-border ##### -->
<!-- ##### ARG GtkDialog:action-area-border ##### -->
<para>
</para>

View File

@ -100,13 +100,13 @@ selected value for the option menu.
</para>
<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
<para>
</para>
<!-- ##### ARG GtkOptionMenu:indicator-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkOptionMenu:indicator-size ##### -->
<para>
</para>

View File

@ -153,26 +153,16 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:trough-border ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-size ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:trough-border ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:stepper-spacing ##### -->
<para>
@ -183,3 +173,13 @@ Emitted when the range value changes.
</para>
<!-- ##### ARG GtkRange:arrow-displacement-y ##### -->
<para>
</para>
<!-- ##### ARG GtkRange:arrow-displacement-x ##### -->
<para>
</para>

View File

@ -148,13 +148,13 @@ format_value_callback (GtkScale *scale,
</para>
<!-- ##### ARG GtkScale:slider-length ##### -->
<para>
</para>
<!-- ##### ARG GtkScale:value-spacing ##### -->
<para>
</para>
<!-- ##### ARG GtkScale:slider-length ##### -->
<para>
</para>

View File

@ -54,11 +54,26 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-backward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:min-slider-length ##### -->
<para>
@ -69,18 +84,3 @@ The #GtkScrollbar struct does not contain any public data.
</para>
<!-- ##### ARG GtkScrollbar:has-secondary-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-forward-stepper ##### -->
<para>
</para>
<!-- ##### ARG GtkScrollbar:has-backward-stepper ##### -->
<para>
</para>

View File

@ -722,3 +722,8 @@ types related to the text widget and how they work together.
@arg2:
@arg3:
<!-- ##### ARG GtkTextBuffer:tag-table ##### -->
<para>
</para>

View File

@ -386,6 +386,21 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:space-style ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:internal-padding ##### -->
<para>
@ -396,18 +411,3 @@ Should be used if you wish to perform an action when ever the style of a toolbar
</para>
<!-- ##### ARG GtkToolbar:space-style ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkToolbar:button-relief ##### -->
<para>
</para>

View File

@ -901,11 +901,6 @@ Function used for #gtk_tree_view_map_expanded_rows.
</para>
<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:horizontal-separator ##### -->
<para>
@ -916,13 +911,18 @@ Function used for #gtk_tree_view_map_expanded_rows.
</para>
<!-- ##### ARG GtkTreeView:expander-size ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:allow-rules ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:expander-size ##### -->
<para>
</para>
<!-- ##### ARG GtkTreeView:vertical-separator ##### -->
<para>
</para>

View File

@ -2158,12 +2158,12 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:has-focus ##### -->
<!-- ##### ARG GtkWidget:is-focus ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:is-focus ##### -->
<!-- ##### ARG GtkWidget:has-focus ##### -->
<para>
</para>
@ -2203,12 +2203,7 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<!-- ##### ARG GtkWidget:focus-padding ##### -->
<para>
</para>
@ -2218,17 +2213,7 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-padding ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<!-- ##### ARG GtkWidget:secondary-cursor-color ##### -->
<para>
</para>
@ -2238,3 +2223,18 @@ a widget changes from un-anchored to anchored or vice-versa.
</para>
<!-- ##### ARG GtkWidget:focus-line-width ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:cursor-aspect-ratio ##### -->
<para>
</para>
<!-- ##### ARG GtkWidget:focus-line-pattern ##### -->
<para>
</para>

View File

@ -877,17 +877,7 @@ gtk_handle_box_paint (GtkWidget *widget,
event ? &event->area : area);
if (bin->child && GTK_WIDGET_VISIBLE (bin->child))
{
GdkRectangle child_area;
if (!event) /* we were called from draw() */
{
if (gtk_widget_intersect (bin->child, area, &child_area))
gtk_widget_draw (bin->child, &child_area);
}
else /* we were called from expose() */
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
}
(* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
}
static gint

View File

@ -724,7 +724,7 @@ gtk_real_menu_item_select (GtkItem *item)
}
gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_PRELIGHT);
gtk_widget_draw (GTK_WIDGET (menu_item), NULL);
gtk_widget_queue_draw (GTK_WIDGET (menu_item));
}
static void
@ -757,7 +757,7 @@ gtk_real_menu_item_deselect (GtkItem *item)
}
gtk_widget_set_state (GTK_WIDGET (menu_item), GTK_STATE_NORMAL);
gtk_widget_draw (GTK_WIDGET (menu_item), NULL);
gtk_widget_queue_draw (GTK_WIDGET (menu_item));
}
static gboolean