summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2000-01-25 22:20:20 +0000
committerOwen Taylor <otaylor@src.gnome.org>2000-01-25 22:20:20 +0000
commitcc7b995f66c9056a49df84b955000252d994cdab (patch)
tree5f1997455c1ad8c4bf0e89656e1f2288c3077cb1
parent03fc238e464f7f7e1dd85ab9bb97f8db04ab6687 (diff)
downloadgdk-pixbuf-cc7b995f66c9056a49df84b955000252d994cdab.tar.gz
Fix return values on mouse events. (Bug #2686, Sky <seb_sky@yahoo.com>)
Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com> * gtk/gtkentry.c: Fix return values on mouse events. (Bug #2686, Sky <seb_sky@yahoo.com>) * gtk/genmarshal.pl: Fix up handling of FOREIGN. (pointed out by George Lebl) * gdk/gdkcolor.c (gdk_color_copy): Made const-safe. (From Ettore Perazzoli <ettore@helixcode.com>)
-rw-r--r--ChangeLog11
-rw-r--r--ChangeLog.pre-2-011
-rw-r--r--ChangeLog.pre-2-1011
-rw-r--r--ChangeLog.pre-2-211
-rw-r--r--ChangeLog.pre-2-411
-rw-r--r--ChangeLog.pre-2-611
-rw-r--r--ChangeLog.pre-2-811
-rw-r--r--gdk/gdk.h2
-rw-r--r--gdk/gdkcolor.c2
-rwxr-xr-xgtk/genmarshal.pl2
-rw-r--r--gtk/gtkentry.c10
11 files changed, 89 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f1ae8b4f7..bc48f0cd1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Wed Jan 26 16:56:54 2000 Owen Taylor <otaylor@redhat.com>
+
+ * gtk/gtkentry.c: Fix return values on mouse events.
+ (Bug #2686, Sky <seb_sky@yahoo.com>)
+
+ * gtk/genmarshal.pl: Fix up handling of FOREIGN.
+ (pointed out by George Lebl)
+
+ * gdk/gdkcolor.c (gdk_color_copy): Made const-safe.
+ (From Ettore Perazzoli <ettore@helixcode.com>)
+
Mon Jan 24 10:44:48 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcalendar.c (gtk_calendar_main_button): Handle
diff --git a/gdk/gdk.h b/gdk/gdk.h
index dbf2f6d40..062ecc2a7 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -556,7 +556,7 @@ void gdk_colormap_free_colors (GdkColormap *colormap,
GdkVisual* gdk_colormap_get_visual (GdkColormap *colormap);
-GdkColor* gdk_color_copy (GdkColor *color);
+GdkColor* gdk_color_copy (const GdkColor *color);
void gdk_color_free (GdkColor *color);
gboolean gdk_color_parse (const gchar *spec,
diff --git a/gdk/gdkcolor.c b/gdk/gdkcolor.c
index b7c509b30..79f43ffb3 100644
--- a/gdk/gdkcolor.c
+++ b/gdk/gdkcolor.c
@@ -451,7 +451,7 @@ gdk_colors_alloc (GdkColormap *colormap,
static GMemChunk *color_chunk;
GdkColor*
-gdk_color_copy (GdkColor *color)
+gdk_color_copy (const GdkColor *color)
{
GdkColor *new_color;
diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl
index 3b5fdfaf8..067afd3fb 100755
--- a/gtk/genmarshal.pl
+++ b/gtk/genmarshal.pl
@@ -8,7 +8,7 @@
"ULONG"=>"gulong", "FLOAT"=>"gfloat",
"DOUBLE"=>"gdouble", "STRING"=>"gpointer",
"ENUM"=>"gint", "FLAGS"=>"gint",
- "BOXED"=>"gpointer", "FOREIGN"=>"gpointer",
+ "BOXED"=>"gpointer",
"POINTER"=>"gpointer",
"OBJECT"=>"gpointer",
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b6a93b1f8..4c2afd99f 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -907,6 +907,8 @@ gtk_entry_button_press (GtkWidget *widget,
default:
break;
}
+
+ return TRUE;
}
else if (event->type == GDK_BUTTON_PRESS)
{
@@ -930,6 +932,8 @@ gtk_entry_button_press (GtkWidget *widget,
if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
}
+
+ return TRUE;
}
return FALSE;
@@ -973,10 +977,14 @@ gtk_entry_button_release (GtkWidget *widget,
if (gdk_selection_owner_get (GDK_SELECTION_PRIMARY) == widget->window)
gtk_selection_owner_set (NULL, GDK_SELECTION_PRIMARY, event->time);
}
+
+ return TRUE;
}
else if (event->button == 3)
{
gtk_grab_remove (widget);
+
+ return TRUE;
}
return FALSE;
@@ -1007,7 +1015,7 @@ gtk_entry_motion_notify (GtkWidget *widget,
entry_adjust_scroll (entry);
gtk_entry_queue_draw (entry);
- return FALSE;
+ return TRUE;
}
static gint