summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-2-07
-rw-r--r--ChangeLog.pre-2-107
-rw-r--r--ChangeLog.pre-2-27
-rw-r--r--ChangeLog.pre-2-47
-rw-r--r--ChangeLog.pre-2-67
-rw-r--r--ChangeLog.pre-2-87
-rw-r--r--gtk/gtkeditable.c12
-rw-r--r--gtk/gtkeditable.h10
-rw-r--r--gtk/gtkentry.c10
-rw-r--r--gtk/gtktext.c4
11 files changed, 67 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e8f189f2c..6fe1840e39 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sun Mar 1 05:18:11 1998 Owen Taylor <owt1@cornell.edu>
+
+ * gtk/gtkentry.c gtk/gtktext.c gtkeditable.[ch]
+
+ Changed interface to cut/copy/paste so it makes sense
+ when triggered by say, menu items.
+
Sun Mar 1 03:20:39 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkentry.[ch] gtk/gtktext.[ch] gtkeditable.[ch]
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index eba3d26750..31628a408c 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -626,14 +626,14 @@ gtk_editable_select_region (GtkEditable *editable,
}
void
-gtk_editable_cut_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_cut_clipboard (GtkEditable *editable, guint32 time)
{
- gtk_editable_copy_clipboard (editable, event);
+ gtk_editable_copy_clipboard (editable, time);
gtk_editable_delete_selection (editable);
}
void
-gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_copy_clipboard (GtkEditable *editable, guint32 time)
{
gint selection_start_pos;
gint selection_end_pos;
@@ -645,7 +645,7 @@ gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
{
if (gtk_selection_owner_set (GTK_WIDGET (editable),
clipboard_atom,
- event->time))
+ time))
editable->clipboard_text = gtk_editable_get_chars (editable,
selection_start_pos,
selection_end_pos);
@@ -653,10 +653,10 @@ gtk_editable_copy_clipboard (GtkEditable *editable, GdkEventKey *event)
}
void
-gtk_editable_paste_clipboard (GtkEditable *editable, GdkEventKey *event)
+gtk_editable_paste_clipboard (GtkEditable *editable, guint32 time)
{
gtk_selection_convert (GTK_WIDGET(editable),
- clipboard_atom, ctext_atom, event->time);
+ clipboard_atom, ctext_atom, time);
}
void
diff --git a/gtk/gtkeditable.h b/gtk/gtkeditable.h
index 58b34f46f0..893f8edf84 100644
--- a/gtk/gtkeditable.h
+++ b/gtk/gtkeditable.h
@@ -36,7 +36,7 @@ extern "C" {
typedef struct _GtkEditable GtkEditable;
typedef struct _GtkEditableClass GtkEditableClass;
-typedef void (*GtkTextFunction) (GtkEditable *editable, GdkEventKey *event);
+typedef void (*GtkTextFunction) (GtkEditable *editable, guint32 time);
struct _GtkEditable
{
@@ -90,12 +90,12 @@ void gtk_editable_delete_text (GtkEditable *editable,
gchar * gtk_editable_get_chars (GtkEditable *editable,
gint start_pos,
gint end_pos);
-void gtk_editable_cut_clipboard (GtkEditable *editable,
- GdkEventKey *event);
+void gtk_editable_cut_clipboard (GtkEditable *editable,
+ guint32 time);
void gtk_editable_copy_clipboard (GtkEditable *editable,
- GdkEventKey *event);
+ guint32 time);
void gtk_editable_paste_clipboard (GtkEditable *editable,
- GdkEventKey *event);
+ guint32 time);
void gtk_editable_claim_selection (GtkEditable *editable,
gboolean claim,
guint32 time);
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 051fb21046..f278040772 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -899,11 +899,11 @@ gtk_entry_key_press (GtkWidget *widget,
if (event->state & GDK_SHIFT_MASK)
{
extend_selection = FALSE;
- gtk_editable_paste_clipboard (editable, event);
+ gtk_editable_paste_clipboard (editable, event->time);
}
else if (event->state & GDK_CONTROL_MASK)
{
- gtk_editable_copy_clipboard (editable, event);
+ gtk_editable_copy_clipboard (editable, event->time);
}
else
{
@@ -915,7 +915,7 @@ gtk_entry_key_press (GtkWidget *widget,
if (event->state & GDK_CONTROL_MASK)
gtk_delete_line (entry);
else if (event->state & GDK_SHIFT_MASK)
- gtk_editable_cut_clipboard (editable, event);
+ gtk_editable_cut_clipboard (editable, event->time);
else
gtk_delete_forward_character (entry);
break;
@@ -955,7 +955,7 @@ gtk_entry_key_press (GtkWidget *widget,
if ((key >= 'a') && (key <= 'z') && control_keys[key - 'a'])
{
- (* control_keys[key - 'a']) (editable, event);
+ (* control_keys[key - 'a']) (editable, event->time);
return_val = TRUE;
}
break;
@@ -967,7 +967,7 @@ gtk_entry_key_press (GtkWidget *widget,
if ((key >= 'a') && (key <= 'z') && alt_keys[key - 'a'])
{
- (* alt_keys[key - 'a']) (editable, event);
+ (* alt_keys[key - 'a']) (editable, event->time);
return_val = TRUE;
}
break;
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 7097514595..10ce5230f8 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1549,7 +1549,7 @@ gtk_text_key_press (GtkWidget *widget,
if ((key >= 'a') && (key <= 'z') && control_keys[(int) (key - 'a')])
{
- (* control_keys[(int) (key - 'a')]) (editable, event);
+ (* control_keys[(int) (key - 'a')]) (editable, event->time);
return_val = TRUE;
}
@@ -1562,7 +1562,7 @@ gtk_text_key_press (GtkWidget *widget,
if ((key >= 'a') && (key <= 'z') && alt_keys[(int) (key - 'a')])
{
- (* alt_keys[(int) (key - 'a')]) (editable, event);
+ (* alt_keys[(int) (key - 'a')]) (editable, event->time);
return_val = TRUE;
}
View Lorry Controller Status