gtk+ r21939 - in trunk: . gtk
- From: matthiasc svn gnome org
- To: svn-commits-list gnome org
- Subject: gtk+ r21939 - in trunk: . gtk
- Date: Sat, 27 Dec 2008 02:25:15 +0000 (UTC)
Author: matthiasc
Date: Sat Dec 27 02:25:15 2008
New Revision: 21939
URL: http://svn.gnome.org/viewvc/gtk+?rev=21939&view=rev
Log:
Small fixes to the icon entry code
Modified:
trunk/ChangeLog
trunk/gtk/gtkentry.c
trunk/gtk/gtkmarshalers.list
Modified: trunk/gtk/gtkentry.c
==============================================================================
--- trunk/gtk/gtkentry.c (original)
+++ trunk/gtk/gtkentry.c Sat Dec 27 02:25:15 2008
@@ -1038,7 +1038,7 @@
* Whether the primary icon is sensitive.
*
* An insensitive icon will appear grayed out, it will not emit
- * #GtkEntry::icon-pressed signal and not change the cursor.
+ * #GtkEntry::icon-pressed signal, not allow DND and not change the cursor.
*
* Since: 2.16
*/
@@ -1056,7 +1056,7 @@
* Whether the secondary icon is sensitive.
*
* An insensitive icon will appear grayed out, it will not emit
- * #GtkEntry::icon-pressed signal and not change the cursor.
+ * #GtkEntry::icon-pressed signal, not allow DND and not change the cursor.
*
* Since: 2.16
*/
@@ -1199,9 +1199,9 @@
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
NULL, NULL,
- _gtk_marshal_VOID__INT_BOXED,
+ _gtk_marshal_VOID__ENUM_BOXED,
G_TYPE_NONE, 2,
- G_TYPE_INT,
+ GTK_TYPE_ENTRY_ICON_POSITION,
GDK_TYPE_EVENT);
/**
@@ -1221,9 +1221,9 @@
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
0,
NULL, NULL,
- _gtk_marshal_VOID__INT_BOXED,
+ _gtk_marshal_VOID__ENUM_BOXED,
G_TYPE_NONE, 2,
- G_TYPE_INT,
+ GTK_TYPE_ENTRY_ICON_POSITION,
GDK_TYPE_EVENT);
@@ -2703,7 +2703,7 @@
if (icon_info->nonactivatable && icon_info->target_list == NULL)
return FALSE;
- if (icon_info->pressed == TRUE)
+ if (icon_info->pressed)
return FALSE;
gtk_widget_style_get (GTK_WIDGET (entry),
@@ -3106,26 +3106,23 @@
if (event->window == icon_info->window)
{
- if (event->button == 1)
+ if (should_prelight (entry, i))
{
- if (should_prelight (entry, i))
- {
- icon_info->prelight = FALSE;
- gtk_widget_queue_draw (widget);
- }
+ icon_info->prelight = FALSE;
+ gtk_widget_queue_draw (widget);
+ }
- if (icon_info->target_list != NULL)
- {
- priv->start_x = event->x;
- priv->start_y = event->y;
+ if (icon_info->target_list != NULL)
+ {
+ priv->start_x = event->x;
+ priv->start_y = event->y;
- icon_info->pressed = TRUE;
- }
+ icon_info->pressed = TRUE;
+ }
- g_signal_emit (entry, signals[ICON_PRESSED], 0, i, event);
+ g_signal_emit (entry, signals[ICON_PRESSED], 0, i, event);
- return TRUE;
- }
+ return TRUE;
}
}
Modified: trunk/gtk/gtkmarshalers.list
==============================================================================
--- trunk/gtk/gtkmarshalers.list (original)
+++ trunk/gtk/gtkmarshalers.list Sat Dec 27 02:25:15 2008
@@ -68,8 +68,8 @@
VOID:ENUM,FLOAT,BOOLEAN
VOID:ENUM,INT
VOID:ENUM,INT,BOOLEAN
+VOID:ENUM,BOXED
VOID:INT
-VOID:INT,BOXED
VOID:INT,BOOLEAN
VOID:INT,INT
VOID:INT,INT,BOXED
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]